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

strv: rework FOREACH_STRING() macro

Browse source 
So it's apparently problematic that we use STRV_MAKE() (i.e. a compound
initializer) outside of the {} block we use it in (and that includes
outside of the ({}) block, too). Hence, let's rework the macro to not
need that.

This also makes the macro shorter, which is definitely a good and more
readable. Moreover, it will now complain if the iterator is a "char*"
instead of a "const char*", which is good too.

Fixes: #11394
This commit is contained in:
Lennart Poettering 2019-01-16 00:13:38 +01:00
parent b2238e380e
commit 66a64081f8
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/basic/strv.h
View file

@ -156,17 +156,10 @@ void strv_print(char **l);
_found; \
})
#define FOREACH_STRING(x, ...) \
for (char **_l = ({ \
char **_ll = STRV_MAKE(__VA_ARGS__); \
x = _ll ? _ll[0] : NULL; \
_ll; \
}); \
_l && *_l; \
x = ({ \
_l ++; \
_l[0]; \
}))
#define FOREACH_STRING(x, y, ...) \
for (char **_l = STRV_MAKE(({ x = y; }), ##__VA_ARGS__); \
x; \
x = *(++_l))
char **strv_reverse(char **l);
char **strv_shell_escape(char **l, const char *bad);