From: Jim Meyering <meyering@fb.com>
Date: Wed, 4 May 2016 03:56:20 +0000 (-0700)
Subject: maint: avoid new warning from gcc (GCC) 7.0.0 20160503 (experimental)
X-Git-Tag: v8.26~109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a4df07016827fe130016b1c3a4adaf91c54c301;p=thirdparty%2Fcoreutils.git

maint: avoid new warning from gcc (GCC) 7.0.0 20160503 (experimental)

* src/id.c (main): When configured with --enable-gcc-warnings and using
the very latest gcc built from git, building would fail with this:
  src/id.c:200:8: error: assuming signed overflow does not occur when \
    simplifying conditional to constant [-Werror=strict-overflow]
     bool default_format = (just_user + just_group + just_group_list
          ^~~~~~~~~~~~~~
Rewrite to use bool-appropriate operators.
---

diff --git a/src/id.c b/src/id.c
index 38844af70a..218ee5a318 100644
--- a/src/id.c
+++ b/src/id.c
@@ -197,8 +197,10 @@ main (int argc, char **argv)
   if (just_user + just_group + just_group_list + just_context > 1)
     error (EXIT_FAILURE, 0, _("cannot print \"only\" of more than one choice"));
 
-  bool default_format = (just_user + just_group + just_group_list
-                         + just_context == 0);
+  bool default_format = ! (just_user
+                           || just_group
+                           || just_group_list
+                           || just_context);
 
   if (default_format && (use_real || use_name))
     error (EXIT_FAILURE, 0,