mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-19 03:33:43 +03:00
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.
This commit is contained in:
1 parent
0d279d2378
commit
2a2d3f237b
1 file changed
+4
-5
@@ -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. */
|
||||
|
||||
Reference in new issue
Block a user