lib: abstract bit validity check in bit test/set/clear macros

Reduce duplication in the bit test/set/clear macros. No functional
changes.
This commit is contained in:
Jani Nikula 2015-02-23 18:56:14 +02:00 committed by David Bremner
parent d7b6e0cae7
commit 41b870fba5

View file

@ -64,15 +64,14 @@ NOTMUCH_BEGIN_DECLS
strncmp ((var), (literal), sizeof (literal) - 1) strncmp ((var), (literal), sizeof (literal) - 1)
/* Robust bit test/set/reset macros */ /* Robust bit test/set/reset macros */
#define _NOTMUCH_VALID_BIT(bit) \
((bit) >= 0 && (bit) < CHAR_BIT * sizeof (unsigned long long))
#define NOTMUCH_TEST_BIT(val, bit) \ #define NOTMUCH_TEST_BIT(val, bit) \
(((bit) < 0 || (bit) >= CHAR_BIT * sizeof (unsigned long long)) ? 0 \ (_NOTMUCH_VALID_BIT(bit) ? !!((val) & (1ull << (bit))) : 0)
: !!((val) & (1ull << (bit))))
#define NOTMUCH_SET_BIT(valp, bit) \ #define NOTMUCH_SET_BIT(valp, bit) \
(((bit) < 0 || (bit) >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \ (_NOTMUCH_VALID_BIT(bit) ? (*(valp) |= (1ull << (bit))) : *(valp))
: (*(valp) |= (1ull << (bit))))
#define NOTMUCH_CLEAR_BIT(valp, bit) \ #define NOTMUCH_CLEAR_BIT(valp, bit) \
(((bit) < 0 || (bit) >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \ (_NOTMUCH_VALID_BIT(bit) ? (*(valp) &= ~(1ull << (bit))) : *(valp))
: (*(valp) &= ~(1ull << (bit))))
#define unused(x) x __attribute__ ((unused)) #define unused(x) x __attribute__ ((unused))