[PATCH 1/3] lib: abstract bit validity check in bit test/set/clear macros
Jani Nikula
jani at nikula.org
Mon Feb 23 08:56:14 PST 2015
Reduce duplication in the bit test/set/clear macros. No functional
changes.
---
lib/notmuch-private.h | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
index 012ad25c42cd..02a8fc62b631 100644
--- a/lib/notmuch-private.h
+++ b/lib/notmuch-private.h
@@ -64,15 +64,14 @@ NOTMUCH_BEGIN_DECLS
strncmp ((var), (literal), sizeof (literal) - 1)
/* 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) \
- (((bit) < 0 || (bit) >= CHAR_BIT * sizeof (unsigned long long)) ? 0 \
- : !!((val) & (1ull << (bit))))
+ (_NOTMUCH_VALID_BIT(bit) ? !!((val) & (1ull << (bit))) : 0)
#define NOTMUCH_SET_BIT(valp, bit) \
- (((bit) < 0 || (bit) >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \
- : (*(valp) |= (1ull << (bit))))
+ (_NOTMUCH_VALID_BIT(bit) ? (*(valp) |= (1ull << (bit))) : *(valp))
#define NOTMUCH_CLEAR_BIT(valp, bit) \
- (((bit) < 0 || (bit) >= CHAR_BIT * sizeof (unsigned long long)) ? *(valp) \
- : (*(valp) &= ~(1ull << (bit))))
+ (_NOTMUCH_VALID_BIT(bit) ? (*(valp) &= ~(1ull << (bit))) : *(valp))
#define unused(x) x __attribute__ ((unused))
--
2.1.4
More information about the notmuch
mailing list