Files with conditional debug statements should ensure that the printf is
always compiled.
This prevents bitrot of the format string of the debug statement.
Signed-off-by: Zhou Jie <zhoujie2...@cn.fujitsu.com>
---
block/curl.c | 13 +++++++------
block/sheepdog.c | 13 ++++++-------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/block/curl.c b/block/curl.c
index 5a8f8b6..6655108 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -32,14 +32,15 @@
#include <curl/curl.h>
#include "qemu/cutils.h"
-// #define DEBUG_CURL
+#define DEBUG_CURL 0
// #define DEBUG_VERBOSE
-#ifdef DEBUG_CURL
-#define DPRINTF(fmt, ...) do { printf(fmt, ## __VA_ARGS__); } while (0)
-#else
-#define DPRINTF(fmt, ...) do { } while (0)
-#endif
+#define DPRINTF(fmt, ...) \
+ do { \
+ if (DEBUG_CURL) { \
+ printf(fmt, ## __VA_ARGS__); \
+ } \
+ } while (0)
#if LIBCURL_VERSION_NUM >= 0x071000
/* The multi interface timer callback was introduced in 7.16.0 */
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 33e0a33..47cca74 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -293,14 +293,13 @@ static inline size_t count_data_objs(const struct
SheepdogInode *inode)
}
#undef DPRINTF
-#ifdef DEBUG_SDOG
-#define DPRINTF(fmt, args...) \
- do { \
- fprintf(stdout, "%s %d: " fmt, __func__, __LINE__, ##args); \
+#define DEBUG_SDOG 0
+#define DPRINTF(fmt, args...) \
+ do { \
+ if (DEBUG_SDOG) { \
+ fprintf(stdout, "%s %d: " fmt, __func__, __LINE__, ##args); \
+ } \
} while (0)
-#else
-#define DPRINTF(fmt, args...)
-#endif
typedef struct SheepdogAIOCB SheepdogAIOCB;
--
2.5.5
