picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

macro: make sure we can use IN_SET() also with complex function calls as first argument

Browse source
This commit is contained in:
Lennart Poettering 2014-03-12 22:26:22 +01:00
parent 0d292f5e75
commit dc36d78e11
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/shared/macro.h
View file

@ -324,13 +324,14 @@ do { \
#define SET_FLAG(v, flag, b) \
(v) = (b) ? ((v) | (flag)) : ((v) & ~(flag))
#define IN_SET(x, ...) \
#define IN_SET(x, y, ...) \
({ \
const typeof(x) _x = (x); \
const typeof(y) _y = (y); \
const typeof(_y) _x = (x); \
unsigned _i; \
bool _found = false; \
for (_i = 0; _i < sizeof((const typeof(_x)[]) { __VA_ARGS__ })/sizeof(const typeof(_x)); _i++) \
if (((const typeof(_x)[]) { __VA_ARGS__ })[_i] == _x) { \
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) { \
_found = true; \
break; \
} \

1
src/test/test-util.c
View file

@ -574,7 +574,6 @@ static void test_fstab_node_to_udev_node(void) {
assert_se(streq(n, "/dev/disk/by-partuuid/037b9d94-148e-4ee4-8d38-67bfe15bb535"));
free(n);
n = fstab_node_to_udev_node("PONIES=awesome");
puts(n);
assert_se(streq(n, "PONIES=awesome"));