diff options
author | Pádraig Brady <P@draigBrady.com> | 2009-09-23 10:10:51 +0100 |
---|---|---|
committer | Pádraig Brady <P@draigBrady.com> | 2009-09-23 14:33:40 +0100 |
commit | a037e838e15c9a698f1634398e0fe2726398d575 (patch) | |
tree | 7361ac5f2c3dbd8fc4763e6fa960e6646670dc79 /src/cat.c | |
parent | ade8dd2096e1898edefadf2314d4e1ec654adda5 (diff) | |
download | coreutils-a037e838e15c9a698f1634398e0fe2726398d575.tar.xz |
maint: Use logical rather than bitwise operators on bools
This is because bitwise operators are:
- confusing and inconsistent in a boolean context
- non short circuiting
- brittle in C89 where bool can be an int (so > 1)
Diffstat (limited to 'src/cat.c')
-rw-r--r-- | src/cat.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -388,7 +388,7 @@ cat ( /* Are line numbers to be written at empty lines (-n)? */ - if (number & !number_nonblank) + if (number && !number_nonblank) { next_line_num (); bpout = stpcpy (bpout, line_num_print); @@ -657,7 +657,7 @@ main (int argc, char **argv) #endif } - if (! (number | show_ends | squeeze_blank)) + if (! (number || show_ends || squeeze_blank)) { file_open_mode |= O_BINARY; if (O_BINARY && ! isatty (STDOUT_FILENO)) @@ -719,8 +719,8 @@ main (int argc, char **argv) /* Select which version of `cat' to use. If any format-oriented options were given use `cat'; otherwise use `simple_cat'. */ - if (! (number | show_ends | show_nonprinting - | show_tabs | squeeze_blank)) + if (! (number || show_ends || show_nonprinting + || show_tabs || squeeze_blank)) { insize = MAX (insize, outsize); inbuf = xmalloc (insize + page_size - 1); |