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.
This commit is contained in:
Jim Meyering committed 2009-02-05 14:53:10 +01:00
1 parent c55c0e7369
commit 8ed84c3438
3 files changed
+5 -5

No files matched your search

+1 -1
View File
@@ -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 =
+2 -2
View File
@@ -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"));
+2 -2
View File
@@ -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. */