summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2015-07-22 17:05:41 +0200
committerMichal Schmidt <mschmidt@redhat.com>2015-07-22 19:29:05 +0200
commit249a2737ba5d0a22f09f077b361d01d514eaf672 (patch)
treef552a44c1665aa5e6d36544cf5cd761ec39eff39
parentbd37a92297a89f00d03757cf860dff9a8ae59b16 (diff)
basic: better readable IN_SET macro
Putting the set elements in an array variable and using ELEMENTSOF makes it clearer what's going on. Incidentally, it also makes gcc -O2 generate slightly smaller code: "size systemd", before: text data bss dec hex filename 1378318 128608 2632 1509558 1708b6 systemd After: text data bss dec hex filename 1377286 128608 2632 1508526 1704ae systemd
-rw-r--r--src/basic/macro.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/basic/macro.h b/src/basic/macro.h
index 5fa17ed208..8fae4d0ede 100644
--- a/src/basic/macro.h
+++ b/src/basic/macro.h
@@ -406,12 +406,12 @@ do { \
#define IN_SET(x, y, ...) \
({ \
- const typeof(y) _y = (y); \
- const typeof(_y) _x = (x); \
+ const typeof(y) _array[] = { (y), __VA_ARGS__ }; \
+ const typeof(y) _x = (x); \
unsigned _i; \
bool _found = false; \
- for (_i = 0; _i < 1 + sizeof((const typeof(_x)[]) { __VA_ARGS__ })/sizeof(const typeof(_x)); _i++) \
- if (((const typeof(_x)[]) { _y, __VA_ARGS__ })[_i] == _x) { \
+ for (_i = 0; _i < ELEMENTSOF(_array); _i++) \
+ if (_array[_i] == _x) { \
_found = true; \
break; \
} \