51 lines
2.1 KiB
Diff
51 lines
2.1 KiB
Diff
|
From ad8b47946941e6a1f3ae778f5e8563ddf532b2ba Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Wed, 16 Jan 2019 00:13:38 +0100
|
||
|
|
Subject: [PATCH] strv: rework FOREACH_STRING() macro
|
||
|
|
|
||
|
|
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
|
||
|
|
(cherry picked from commit 66a64081f82dfad90f2f9394a477820a2e3e6510)
|
||
|
|
|
||
|
|
(cherry picked from commit 3539a72c260063713e4ecba17966ba9a768d8af9)
|
||
|
|
|
||
|
|
Related: #2039327
|
||
|
|
---
|
||
|
|
src/basic/strv.h | 15 ++++-----------
|
||
|
|
1 file changed, 4 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/basic/strv.h b/src/basic/strv.h
|
||
|
|
index c1e4c973b6..a09d76706d 100644
|
||
|
|
--- a/src/basic/strv.h
|
||
|
|
+++ b/src/basic/strv.h
|
||
|
|
@@ -148,17 +148,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);
|