linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 4/9] btrfs-progs: Fix Wempty-body warning
Date: Fri, 16 Nov 2018 15:54:21 +0800	[thread overview]
Message-ID: <20181116075426.4142-5-wqu@suse.com> (raw)
In-Reply-To: <20181116075426.4142-1-wqu@suse.com>

messages.h:49:24: warning: suggest braces around empty body in an 'if' statement [-Wempty-body]
    PRINT_TRACE_ON_ERROR;    \

Just extra braces would solve the problem.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 messages.h | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/messages.h b/messages.h
index ec7d93381a36..16f650d19a4b 100644
--- a/messages.h
+++ b/messages.h
@@ -45,13 +45,16 @@
 
 #define error_on(cond, fmt, ...)					\
 	do {								\
-		if ((cond))						\
+		if ((cond)) {						\
 			PRINT_TRACE_ON_ERROR;				\
-		if ((cond))						\
+		}							\
+		if ((cond)) {						\
 			PRINT_VERBOSE_ERROR;				\
+		}							\
 		__btrfs_error_on((cond), (fmt), ##__VA_ARGS__);		\
-		if ((cond))						\
+		if ((cond)) {						\
 			DO_ABORT_ON_ERROR;				\
+		}							\
 	} while (0)
 
 #define error_btrfs_util(err)						\
@@ -76,10 +79,12 @@
 
 #define warning_on(cond, fmt, ...)					\
 	do {								\
-		if ((cond))						\
+		if ((cond)) {						\
 			PRINT_TRACE_ON_ERROR;				\
-		if ((cond))						\
+		}							\
+		if ((cond)) {						\
 			PRINT_VERBOSE_ERROR;				\
+		}							\
 		__btrfs_warning_on((cond), (fmt), ##__VA_ARGS__);	\
 	} while (0)
 
-- 
2.19.1


  parent reply	other threads:[~2018-11-16  7:54 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-16  7:54 [PATCH 0/9] btrfs-progs: Make W=1 clean (no "again") Qu Wenruo
2018-11-16  7:54 ` [PATCH 1/9] btrfs-progs: Makefile.extrawarn: Import cc-disable-warning Qu Wenruo
2018-12-04 11:04   ` David Sterba
2018-11-16  7:54 ` [PATCH 2/9] btrfs-progs: fix gcc8 default build warning caused by '-Wformat-truncation' Qu Wenruo
2018-12-04 11:10   ` David Sterba
2018-12-04 12:21     ` Qu Wenruo
2018-11-16  7:54 ` [PATCH 3/9] btrfs-progs: Makefile.extrawarn: Don't warn on sign compare Qu Wenruo
2018-11-16  8:00   ` [PATCH v1.1 " Qu Wenruo
2018-12-04 11:10     ` David Sterba
2018-11-16  7:54 ` Qu Wenruo [this message]
2018-11-16  8:01   ` [PATCH 4/9] btrfs-progs: Fix Wempty-body warning Nikolay Borisov
2018-11-16  7:54 ` [PATCH 5/9] btrfs-progs: Fix Wimplicit-fallthrough warning Qu Wenruo
2018-11-16  8:04   ` Nikolay Borisov
2018-11-16  8:10     ` Qu Wenruo
2018-11-16  7:54 ` [PATCH 6/9] btrfs-progs: Fix Wsuggest-attribute=format warning Qu Wenruo
2018-11-16  8:06   ` Nikolay Borisov
2018-11-16  7:54 ` [PATCH 7/9] btrfs-progs: Fix Wmaybe-uninitialized warning Qu Wenruo
2018-11-16  8:13   ` Nikolay Borisov
2018-11-16  8:16     ` Qu Wenruo
2018-11-16  8:22   ` [PATCH v1.1 " Qu Wenruo
2018-11-16  8:24     ` Nikolay Borisov
2018-12-04 12:17   ` [PATCH " David Sterba
2018-12-04 12:22     ` Adam Borowski
2018-12-04 12:42       ` Nikolay Borisov
2018-12-05  5:38     ` Qu Wenruo
2018-11-16  7:54 ` [PATCH 8/9] btrfs-progs: Fix Wtype-limits warning Qu Wenruo
2018-11-16  8:07   ` Nikolay Borisov
2018-11-16  7:54 ` [PATCH 9/9] btrfs-progs: Cleanup warning reported by -Wmissing-prototypes except free space tree Qu Wenruo
2018-11-16  8:04   ` [PATCH v1.1 9/9] btrfs-progs: Cleanup warning reported by -Wmissing-prototypes Qu Wenruo
2018-11-16  8:14     ` Nikolay Borisov
2018-12-04 12:22     ` David Sterba
2018-12-04 12:24       ` Qu Wenruo
2018-12-04 12:48         ` David Sterba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181116075426.4142-5-wqu@suse.com \
    --to=wqu@suse.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).