From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aneFU-0003cZ-6v for qemu-devel@nongnu.org; Tue, 05 Apr 2016 23:35:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aneFP-0002Nn-F8 for qemu-devel@nongnu.org; Tue, 05 Apr 2016 23:35:20 -0400 Received: from resqmta-po-11v.sys.comcast.net ([2001:558:fe16:19:96:114:154:170]:57466 helo=resqmta-ch2-11v.sys.comcast.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aneFP-0002Mu-AH for qemu-devel@nongnu.org; Tue, 05 Apr 2016 23:35:15 -0400 From: Eric Blake Date: Tue, 5 Apr 2016 21:35:03 -0600 Message-Id: <1459913704-19949-3-git-send-email-eblake@redhat.com> In-Reply-To: <1459913704-19949-1-git-send-email-eblake@redhat.com> References: <1459913704-19949-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH 2/3] nbd: Avoid bitrot in TRACE() usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com The compiler is smart enough to optimize out 'if (0)', but won't type-check our printfs if they are hidden behind #if. Signed-off-by: Eric Blake --- nbd/nbd-internal.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h index 127c48d..f4dce06 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -33,18 +33,21 @@ #define DEBUG_NBD #ifdef DEBUG_NBD -#define TRACE(msg, ...) do { \ - LOG(msg, ## __VA_ARGS__); \ -} while(0) +#define DEBUG_NBD_PRINT 1 #else -#define TRACE(msg, ...) \ - do { } while (0) +#define DEBUG_NBD_PRINT 0 #endif +#define TRACE(msg, ...) do { \ + if (DEBUG_NBD_PRINT) { \ + LOG(msg, ## __VA_ARGS__); \ + } \ +} while (0) + #define LOG(msg, ...) do { \ fprintf(stderr, "%s:%s():L%d: " msg "\n", \ __FILE__, __FUNCTION__, __LINE__, ## __VA_ARGS__); \ -} while(0) +} while (0) /* This is all part of the "official" NBD API. * -- 2.5.5