mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: always compile-check debug prints

Browse Source 
Files with conditional debug statements should ensure that the printf is
always compiled. This prevents bitrot of the format string of the debug
statement. And switch debug output to stderr.

Signed-off-by: Zhou Jie <zhoujie2011@cn.fujitsu.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Zhou Jie 2016-04-29 13:12:01 +08:00 committed by Kevin Wolf
parent 547cb1574e
commit ed79f37d9b
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/curl.c
View File

@ -36,10 +36,16 @@
// #define DEBUG_VERBOSE // #define DEBUG_VERBOSE
#ifdef DEBUG_CURL #ifdef DEBUG_CURL
#define DPRINTF(fmt, ...) do { printf(fmt, ## __VA_ARGS__); } while (0) #define DEBUG_CURL_PRINT 1
#else #else
#define DPRINTF(fmt, ...) do { } while (0) #define DEBUG_CURL_PRINT 0
#endif #endif
#define DPRINTF(fmt, ...) \
do { \
if (DEBUG_CURL_PRINT) { \
fprintf(stderr, fmt, ## __VA_ARGS__); \
} \
} while (0)
#if LIBCURL_VERSION_NUM >= 0x071000 #if LIBCURL_VERSION_NUM >= 0x071000
/* The multi interface timer callback was introduced in 7.16.0 */ /* The multi interface timer callback was introduced in 7.16.0 */

11
block/sheepdog.c
View File

@ -294,13 +294,16 @@ static inline size_t count_data_objs(const struct SheepdogInode *inode)
#undef DPRINTF #undef DPRINTF
#ifdef DEBUG_SDOG #ifdef DEBUG_SDOG
#define DEBUG_SDOG_PRINT 1
#else
#define DEBUG_SDOG_PRINT 0
#endif
#define DPRINTF(fmt, args...) \ #define DPRINTF(fmt, args...) \
do { \ do { \
fprintf(stdout, "%s %d: " fmt, __func__, __LINE__, ##args); \ if (DEBUG_SDOG_PRINT) { \
fprintf(stderr, "%s %d: " fmt, __func__, __LINE__, ##args); \
} \
} while (0) } while (0)
#else
#define DPRINTF(fmt, args...)
#endif
typedef struct SheepdogAIOCB SheepdogAIOCB; typedef struct SheepdogAIOCB SheepdogAIOCB;