From: Jim Meyering <meyering@redhat.com>
Date: Thu, 7 Aug 2008 21:01:16 +0000 (+0200)
Subject: dd.c: reduce duplication in new O_FULLBLOCK-defining code
X-Git-Tag: v7.0~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a2d3f237b256e43d55c9c0149d5ceba750f30f8;p=thirdparty%2Fcoreutils.git

dd.c: reduce duplication in new O_FULLBLOCK-defining code

* src/dd.c (MULTIPLE_BITS_SET): New macro, extracted from...
(multiple_bits_set): ...this function.
Use a single-line, and far simpler expression (no need to list all
O_* symbols again) to validate the derived O_FULLBLOCK value.
---

diff --git a/src/dd.c b/src/dd.c
index 8c9400b116..ea852afe19 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -278,11 +278,10 @@ enum
 /* Ensure that we didn't shift it off the end.  */
 verify (O_FULLBLOCK != 0);
 
+#define MULTIPLE_BITS_SET(i) (((i) & ((i) - 1)) != 0)
+
 /* Ensure that this is a single-bit value.  */
-verify ((O_FULLBLOCK &
-	 ( O_APPEND | O_BINARY | O_DIRECT | O_DIRECTORY | O_DSYNC
-	   | O_NOATIME | O_NOCTTY | O_NOFOLLOW | O_NOLINKS | O_NONBLOCK
-	   | O_SYNC | O_TEXT)) == 0);
+verify ( ! MULTIPLE_BITS_SET (O_FULLBLOCK));
 
 /* Flags, for iflag="..." and oflag="...".  */
 static struct symbol_value const flags[] =
@@ -576,7 +575,7 @@ translate_charset (char const *new_trans)
 static inline bool
 multiple_bits_set (int i)
 {
-  return (i & (i - 1)) != 0;
+  return MULTIPLE_BITS_SET (i);
 }
 
 /* Print transfer statistics.  */