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

strv: fix STRV_FOREACH_BACKWARDS() to be a single statement only 

Let's make sure people invoking STRV_FOREACH_BACKWARDS() as a single statement
of an if statement don't fall into a trap, and find the tail for the list via
strv_length().
This commit is contained in:
Lennart Poettering 2016-08-26 19:18:15 +02:00
parent f767d3de65
commit 4a39c77419
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/basic/strv.h
View File

@ -96,10 +96,13 @@ bool strv_overlap(char **a, char **b) _pure_;
#define STRV_FOREACH(s, l) \
for ((s) = (l); (s) && *(s); (s)++)
#define STRV_FOREACH_BACKWARDS(s, l) \
STRV_FOREACH(s, l) \
; \
for ((s)--; (l) && ((s) >= (l)); (s)--)
#define STRV_FOREACH_BACKWARDS(s, l) \
for (s = ({ \
char **_l = l; \
_l ? _l + strv_length(_l) - 1U : NULL; \
}); \
(l) && ((s) >= (l)); \
(s)--)
#define STRV_FOREACH_PAIR(x, y, l) \
for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1))

9
src/test/test-strv.c
View File

@ -453,9 +453,14 @@ static void test_strv_foreach_backwards(void) {
assert_se(a);
STRV_FOREACH_BACKWARDS(check, a) {
STRV_FOREACH_BACKWARDS(check, a)
assert_se(streq_ptr(*check, input_table_multiple[i--]));
}
STRV_FOREACH_BACKWARDS(check, (char**) NULL)
assert_not_reached("Let's see that we check empty strv right, too.");
STRV_FOREACH_BACKWARDS(check, (char**) { NULL })
assert_not_reached("Let's see that we check empty strv right, too.");
}
static void test_strv_foreach_pair(void) {