From: Jim Meyering <meyering@redhat.com>
Date: Thu, 5 Feb 2009 13:53:10 +0000 (+0100)
Subject: avoid spurious parentheses/arith-op-related warnings from newer gcc
X-Git-Tag: v7.1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8ed84c34388b3e475ece2f93ac22e25546503f16;p=thirdparty%2Fcoreutils.git

avoid spurious parentheses/arith-op-related warnings from newer gcc

* src/copy.c (set_owner): Use && rather than &.
* src/stty.c (main): Likewise.
* src/wc.c (wc): Likewise.
---

diff --git a/src/copy.c b/src/copy.c
index 85d1fea13e..a6ca9dda49 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -275,7 +275,7 @@ set_owner (const struct cp_options *x, char const *dst_name, int dest_desc,
      group.  Avoid the window by first changing to a restrictive
      temporary mode if necessary.  */
 
-  if (!new_dst & (x->preserve_mode | x->move_mode | x->set_mode))
+  if (!new_dst && (x->preserve_mode | x->move_mode | x->set_mode))
     {
       mode_t old_mode = dst_sb->st_mode;
       mode_t new_mode =
diff --git a/src/stty.c b/src/stty.c
index eb4f30f073..389ab9eb90 100644
--- a/src/stty.c
+++ b/src/stty.c
@@ -1,5 +1,5 @@
 /* stty -- change and print terminal line settings
-   Copyright (C) 1990-2005, 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 1990-2005, 2007-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -815,7 +815,7 @@ main (int argc, char **argv)
 	     "mutually exclusive"));
 
   /* Specifying any other arguments with -a or -g gets an error.  */
-  if (!noargs & (verbose_output | recoverable_output))
+  if (!noargs && (verbose_output | recoverable_output))
     error (EXIT_FAILURE, 0,
 	   _("when specifying an output style, modes may not be set"));
 
diff --git a/src/wc.c b/src/wc.c
index b1afe14952..e6ffd1a582 100644
--- a/src/wc.c
+++ b/src/wc.c
@@ -1,5 +1,5 @@
 /* wc - print the number of lines, words, and bytes in files
-   Copyright (C) 85, 91, 1995-2008 Free Software Foundation, Inc.
+   Copyright (C) 85, 91, 1995-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -249,7 +249,7 @@ wc (int fd, char const *file_x, struct fstatus *fstatus)
 	    }
 	}
     }
-  else if (!count_chars & !count_complicated)
+  else if (!count_chars && !count_complicated)
     {
       /* Use a separate loop when counting only lines or lines and bytes --
 	 but not chars or words.  */