Suppress warning when compile with DEBUG or/and USE_SYSLOG in CFLAGS

viveris · Apr 17, 2018 · 7b9e303 · 7b9e303
1 parent fbc3d0a
commit 7b9e303
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/inc/logs_out.h b/inc/logs_out.h
@@ -85,6 +85,12 @@
                                             ## args);               \
                                     fflush(stdout);                 \
                                   }
+#else
+
+#define PRINT_DEBUG(fmt, args...)
+
+#endif
+
 #endif
 
 #ifdef DEBUG
@@ -94,11 +100,9 @@ void printbuf(void * buf,int size);
 
 #else
 
-#define PRINT_DEBUG(x...)
 #define PRINT_DEBUG_BUF(x, y)
 
 #endif
 
 #endif
 
-#endif
diff --git a/src/logs_out.c b/src/logs_out.c
@@ -25,6 +25,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 #include "logs_out.h"
 
 #ifdef DEBUG

diff --git a/src/mtp_datasets.c b/src/mtp_datasets.c
@@ -26,6 +26,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include <inttypes.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -99,8 +100,8 @@ int build_storageinfo_dataset(mtp_ctx * ctx,void * buffer, int maxsize,uint32_t
 		{
 			totalspace = (uint64_t)fsbuf.f_bsize * (uint64_t)fsbuf.f_blocks;
 			freespace = (uint64_t)fsbuf.f_bsize * (uint64_t)fsbuf.f_bavail;
-			PRINT_DEBUG("Total space %llu byte(s)", totalspace);
-			PRINT_DEBUG("Free space %llu byte(s)", freespace);
+			PRINT_DEBUG("Total space %" PRIu64 " byte(s)", totalspace);
+			PRINT_DEBUG("Free space %" PRIu64 " byte(s)", freespace);
 		}
 		else
 		{

diff --git a/src/usb_gadget.c b/src/usb_gadget.c
@@ -135,7 +135,7 @@ void fill_config_descriptor(mtp_ctx * ctx , usb_gadget * usbctx,struct usb_confi
 	desc->bmAttributes = USB_CONFIG_ATT_ONE;
 	desc->bMaxPower = 1;
 
-	PRINT_DEBUG("fill_config_descriptor: (Total Len : %d + %d = %d)",sizeof(struct usb_config_descriptor) ,total_size,desc->wTotalLength);
+	PRINT_DEBUG("fill_config_descriptor: (Total Len : %lu + %d = %d)",sizeof(struct usb_config_descriptor) ,total_size,desc->wTotalLength);
 	PRINT_DEBUG_BUF(desc, sizeof(struct usb_config_descriptor));
 
 	return;