diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-02-05 14:53:10 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-02-05 14:53:10 +0100 |
| commit | 8ed84c34388b3e475ece2f93ac22e25546503f16 (patch) | |
| tree | 018dc7c9796f43fe17badf9d0c493e69764a130a /src | |
| parent | c55c0e736926178d317027fb8c938c266d7b0ea3 (diff) | |
| download | coreutils-8ed84c34388b3e475ece2f93ac22e25546503f16.tar.xz | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/copy.c | 2 | ||||
| -rw-r--r-- | src/stty.c | 4 | ||||
| -rw-r--r-- | src/wc.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/copy.c b/src/copy.c index 85d1fea13..a6ca9dda4 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 eb4f30f07..389ab9eb9 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")); @@ -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. */ |