From patchwork Thu Apr 28 08:01:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhou Jie X-Patchwork-Id: 8966011 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C162C9F441 for ; Thu, 28 Apr 2016 08:02:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 066A22026C for ; Thu, 28 Apr 2016 08:02:05 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CE9AC20259 for ; Thu, 28 Apr 2016 08:02:03 +0000 (UTC) Received: from localhost ([::1]:47097 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avgtf-0006uS-9h for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Apr 2016 04:02:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avgtX-0006pc-7t for qemu-devel@nongnu.org; Thu, 28 Apr 2016 04:01:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1avgtT-00041A-Rg for qemu-devel@nongnu.org; Thu, 28 Apr 2016 04:01:55 -0400 Received: from [59.151.112.132] (port=49921 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1avgtT-0003vg-GG for qemu-devel@nongnu.org; Thu, 28 Apr 2016 04:01:51 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="6059915" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Apr 2016 16:01:45 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 7082D42B4B00; Thu, 28 Apr 2016 16:01:44 +0800 (CST) Received: from localhost.localdomain.localdomain (10.167.226.45) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.279.2; Thu, 28 Apr 2016 16:01:43 +0800 From: Zhou Jie To: Date: Thu, 28 Apr 2016 16:01:21 +0800 Message-ID: <1461830481-20165-1-git-send-email-zhoujie2011@cn.fujitsu.com> X-Mailer: git-send-email 2.5.5 MIME-Version: 1.0 X-Originating-IP: [10.167.226.45] X-yoursite-MailScanner-ID: 7082D42B4B00.A4353 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhoujie2011@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH] block: always compile-check debug prints X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcody@redhat.com, Zhou Jie Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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 #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;