From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN2qV-0002E4-7t for qemu-devel@nongnu.org; Thu, 07 Dec 2017 15:32:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eN2qU-0005EA-8Y for qemu-devel@nongnu.org; Thu, 07 Dec 2017 15:32:39 -0500 From: Eric Blake Date: Thu, 7 Dec 2017 14:30:31 -0600 Message-Id: <20171207203036.14993-16-eblake@redhat.com> In-Reply-To: <20171207203036.14993-1-eblake@redhat.com> References: <20171207203036.14993-1-eblake@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v6 15/20] vdi: Avoid bitrot of debugging code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, qemu-block@nongnu.org, vsementsov@virtuozzo.com, Stefan Weil , Max Reitz Rework the debug define so that we always get -Wformat checking, even when debugging is disabled. Signed-off-by: Eric Blake Reviewed-by: Stefan Weil Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Vladimir Sementsov-Ogievskiy --- v2-v5: no change --- block/vdi.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 8da5dfc897..6f83221ddc 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -86,12 +86,18 @@ #define DEFAULT_CLUSTER_SIZE (1 * MiB) #if defined(CONFIG_VDI_DEBUG) -#define logout(fmt, ...) \ - fprintf(stderr, "vdi\t%-24s" fmt, __func__, ##__VA_ARGS_= _) +#define VDI_DEBUG 1 #else -#define logout(fmt, ...) ((void)0) +#define VDI_DEBUG 0 #endif +#define logout(fmt, ...) \ + do { = \ + if (VDI_DEBUG) { = \ + fprintf(stderr, "vdi\t%-24s" fmt, __func__, ##__VA_ARGS__); = \ + } = \ + } while (0) + /* Image signature. */ #define VDI_SIGNATURE 0xbeda107f --=20 2.14.3