| Message ID | 1461894245-22798-1-git-send-email-zhoujie2011@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/28/2016 07:44 PM, Zhou Jie wrote: > Files with conditional debug statements should ensure that the printf is > always compiled. > This prevents bitrot of the format string of the debug statement. The commit message needs to mention... > > Signed-off-by: Zhou Jie <zhoujie2011@cn.fujitsu.com> > --- Right here would be a good place to list how v2 differs from v1. > block/curl.c | 10 ++++++++-- > block/sheepdog.c | 13 ++++++++----- > 2 files changed, 16 insertions(+), 7 deletions(-) > > diff --git a/block/curl.c b/block/curl.c > index 5a8f8b6..da9f5e8 100644 > --- a/block/curl.c > +++ b/block/curl.c > @@ -36,10 +36,16 @@ > // #define DEBUG_VERBOSE > > #ifdef DEBUG_CURL > -#define DPRINTF(fmt, ...) do { printf(fmt, ## __VA_ARGS__); } while (0) > +#define DEBUG_CURL_PRINT 1 > #else > -#define DPRINTF(fmt, ...) do { } while (0) > +#define DEBUG_CURL_PRINT 0 > #endif > +#define DPRINTF(fmt, ...) \ > + do { \ > + if (DEBUG_CURL_PRINT) { \ > + fprintf(stderr, fmt, ## __VA_ARGS__); \ ...that you are intentionally switching debug output to stderr. The code changes themselves look fine to me now, so with a better commit message, you could add: Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/block/curl.c b/block/curl.c index 5a8f8b6..da9f5e8 100644 --- a/block/curl.c +++ b/block/curl.c @@ -36,10 +36,16 @@ // #define DEBUG_VERBOSE #ifdef DEBUG_CURL -#define DPRINTF(fmt, ...) do { printf(fmt, ## __VA_ARGS__); } while (0) +#define DEBUG_CURL_PRINT 1 #else -#define DPRINTF(fmt, ...) do { } while (0) +#define DEBUG_CURL_PRINT 0 #endif +#define DPRINTF(fmt, ...) \ + do { \ + if (DEBUG_CURL_PRINT) { \ + fprintf(stderr, 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..9023686 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -294,13 +294,16 @@ 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); \ - } while (0) +#define DEBUG_SDOG_PRINT 1 #else -#define DPRINTF(fmt, args...) +#define DEBUG_SDOG_PRINT 0 #endif +#define DPRINTF(fmt, args...) \ + do { \ + if (DEBUG_SDOG_PRINT) { \ + fprintf(stderr, "%s %d: " fmt, __func__, __LINE__, ##args); \ + } \ + } while (0) typedef struct SheepdogAIOCB SheepdogAIOCB;
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 <zhoujie2011@cn.fujitsu.com> --- block/curl.c | 10 ++++++++-- block/sheepdog.c | 13 ++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-)