Util-Linux package development
 help / color / mirror / Atom feed
From: Ruediger Meier <sweet_f_a@gmx.de>
To: util-linux@vger.kernel.org
Subject: [PATCH 6/6] libblkid: fix gcc-7 warning -Wint-in-bool-context
Date: Mon, 12 Jun 2017 10:49:58 +0200	[thread overview]
Message-ID: <20170612084958.22054-7-sweet_f_a@gmx.de> (raw)
In-Reply-To: <20170612084958.22054-1-sweet_f_a@gmx.de>

From: Ruediger Meier <ruediger.meier@ga-group.nl>

BLOCK_SIZE(sb) should be unsigned so that the left shift is defined.

This was the warning:

../libblkid/src/superblocks/exfat.c: In function 'probe_exfat':
../libblkid/src/superblocks/exfat.c:40:42: warning: '<<' in boolean context, did you mean '<' ? [-Wint-in-bool-context]
 #define CLUSTER_SIZE(sb) (BLOCK_SIZE(sb) << (sb)->bpc_bits)
                          ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~
../libblkid/src/superblocks/exfat.c:122:14: note: in expansion of macro 'CLUSTER_SIZE'
  if (!sb || !CLUSTER_SIZE(sb))
              ^~~~~~~~~~~~

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
 libblkid/src/superblocks/exfat.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libblkid/src/superblocks/exfat.c b/libblkid/src/superblocks/exfat.c
index 659e196c2..f5a22ee81 100644
--- a/libblkid/src/superblocks/exfat.c
+++ b/libblkid/src/superblocks/exfat.c
@@ -36,8 +36,8 @@ struct exfat_entry_label {
 	uint8_t name[30];
 } __attribute__((__packed__));
 
-#define BLOCK_SIZE(sb) (1 << (sb)->block_bits)
-#define CLUSTER_SIZE(sb) (BLOCK_SIZE(sb) << (sb)->bpc_bits)
+#define BLOCK_SIZE(sb) (1u << (sb)->block_bits)
+#define CLUSTER_SIZE(sb) ((BLOCK_SIZE(sb) << (sb)->bpc_bits))
 #define EXFAT_FIRST_DATA_CLUSTER 2
 #define EXFAT_LAST_DATA_CLUSTER 0xffffff6
 #define EXFAT_ENTRY_SIZE 32
-- 
2.12.3


  parent reply	other threads:[~2017-06-12  8:50 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-12  8:49 [PATCH 0/6] fix various minor issues and warnings Ruediger Meier
2017-06-12  8:49 ` [PATCH 1/6] tests: fix fincore, don't use variable COLUMNS Ruediger Meier
2017-06-12  8:49 ` [PATCH 2/6] libmount: btrfs, remove unused setter functions Ruediger Meier
2017-06-12  8:49 ` [PATCH 3/6] hwclock: fix warning [-Winvalid-noreturn] Ruediger Meier
2017-06-12  8:49 ` [PATCH 4/6] misc: fix gcc-7 sprintf warnings -Wformat-overflow Ruediger Meier
2017-06-12  8:49 ` [PATCH 5/6] misc: fix gcc-7 snprintf warnings -Wformat-truncation Ruediger Meier
2017-06-12 19:27   ` Rüdiger Meier
2017-06-12  8:49 ` Ruediger Meier [this message]
2017-06-13 13:47 ` [PATCH 0/6] fix various minor issues and warnings Karel Zak
2017-06-13 15:18   ` Rüdiger Meier
2017-06-14 10:10     ` Karel Zak
2017-06-14 11:06       ` Ruediger Meier

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=20170612084958.22054-7-sweet_f_a@gmx.de \
    --to=sweet_f_a@gmx.de \
    --cc=util-linux@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