[SCM] Socket Wrapper Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  b7ec347 src: Case pid_t to an int in SWRAP_LOG.
      from  e5df09b cmake: Only build test_sendmsg_recvmsg_fd if we have msg_control.

http://gitweb.samba.org/?p=socket_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b7ec347fca6b11a2297c4d637ec8d8d7b0aebfc6
Author: Andreas Schneider <asn at samba.org>
Date:   Tue Jan 21 09:57:47 2014 +0100

    src: Case pid_t to an int in SWRAP_LOG.

-----------------------------------------------------------------------

Summary of changes:
 src/socket_wrapper.c |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index 2edc8df..c5b94fb 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -95,14 +95,6 @@ enum swrap_dbglvl_e {
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #endif
 
-#if SIZEOF_PID_T == 8
-# define SPRIpid PRIu64
-#elif SIZEOF_UID_T == 4
-# define SPRIpid PRIu32
-#else
-# define SPRIpid "%d"	    /* Sane default for most platforms */
-#endif /* SIZEOF_UID_T */
-
 #ifndef ZERO_STRUCT
 #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
 #endif
@@ -249,23 +241,23 @@ static void swrap_log(enum swrap_dbglvl_e dbglvl, const char *format, ...)
 		switch (dbglvl) {
 			case SWRAP_LOG_ERROR:
 				fprintf(stderr,
-					"SWRAP_ERROR("SPRIpid"): %s\n",
-					getpid(), buffer);
+					"SWRAP_ERROR(%d): %s\n",
+					(int)getpid(), buffer);
 				break;
 			case SWRAP_LOG_WARN:
 				fprintf(stderr,
-					"SWRAP_WARN("SPRIpid"): %s\n",
-					getpid(), buffer);
+					"SWRAP_WARN(%d): %s\n",
+					(int)getpid(), buffer);
 				break;
 			case SWRAP_LOG_DEBUG:
 				fprintf(stderr,
-					"SWRAP_DEBUG("SPRIpid"): %s\n",
-					getpid(), buffer);
+					"SWRAP_DEBUG(%d): %s\n",
+					(int)getpid(), buffer);
 				break;
 			case SWRAP_LOG_TRACE:
 				fprintf(stderr,
-					"SWRAP_TRACE("SPRIpid"): %s\n",
-					getpid(), buffer);
+					"SWRAP_TRACE(%d): %s\n",
+					(int)getpid(), buffer);
 				break;
 		}
 	}


-- 
Socket Wrapper Repository