From c01846db2d31b2125d0b1e6bcfc4c38de345d52a Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Wed, 11 Dec 2013 15:03:32 +0100
Subject: Fix formatting of variables of type pid_t

---
 src/socket_wrapper.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index a7d3c1b..addcc17 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -95,6 +95,14 @@ 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
@@ -241,22 +249,22 @@ static void swrap_log(enum swrap_dbglvl_e dbglvl, const char *format, ...)
 		switch (dbglvl) {
 			case SWRAP_LOG_ERROR:
 				fprintf(stderr,
-					"SWRAP_ERROR(%d): %s\n",
+					"SWRAP_ERROR("SPRIpid"): %s\n",
 					getpid(), buffer);
 				break;
 			case SWRAP_LOG_WARN:
 				fprintf(stderr,
-					"SWRAP_WARN(%d): %s\n",
+					"SWRAP_WARN("SPRIpid"): %s\n",
 					getpid(), buffer);
 				break;
 			case SWRAP_LOG_DEBUG:
 				fprintf(stderr,
-					"SWRAP_DEBUG(%d): %s\n",
+					"SWRAP_DEBUG("SPRIpid"): %s\n",
 					getpid(), buffer);
 				break;
 			case SWRAP_LOG_TRACE:
 				fprintf(stderr,
-					"SWRAP_TRACE(%d): %s\n",
+					"SWRAP_TRACE("SPRIpid"): %s\n",
 					getpid(), buffer);
 				break;
 		}
-- 
cgit