SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strv: introduce new strv_from_stdarg_alloca() macro to generate a string array from stdarg function parameters

Browse Source 
This allows us to turn lists of strings passed in easily into string
arrays without having to allocate memory.
This commit is contained in:
Lennart Poettering
2013-10-29 19:53:43 +01:00
parent 7b1132f60d
commit 250a918dc4
5 changed files with 76 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-strv.c
+37 -16
View File
@@ -283,31 +283,31 @@ static void test_strv_append(void) {
}
static void test_strv_foreach(void) {
_cleanup_strv_free_ char **a;
unsigned i = 0;
char **check;
_cleanup_strv_free_ char **a;
unsigned i = 0;
char **check;
a = strv_new("one", "two", "three", NULL);
a = strv_new("one", "two", "three", NULL);
assert_se(a);
assert_se(a);
STRV_FOREACH(check, a) {
assert_se(streq(*check, input_table_multiple[i++]));
}
STRV_FOREACH(check, a) {
assert_se(streq(*check, input_table_multiple[i++]));
}
}
static void test_strv_foreach_backwards(void) {
_cleanup_strv_free_ char **a;
unsigned i = 2;
char **check;
_cleanup_strv_free_ char **a;
unsigned i = 2;
char **check;
a = strv_new("one", "two", "three", NULL);
a = strv_new("one", "two", "three", NULL);
assert_se(a);
assert_se(a);
STRV_FOREACH_BACKWARDS(check, a) {
assert_se(streq(*check, input_table_multiple[i--]));
}
STRV_FOREACH_BACKWARDS(check, a) {
assert_se(streq(*check, input_table_multiple[i--]));
}
}
static void test_strv_foreach_pair(void) {
@@ -324,6 +324,26 @@ static void test_strv_foreach_pair(void) {
}
}
static void test_strv_from_stdarg_alloca_one(const char **l, const char *first, ...) {
char **j;
unsigned i;
j = strv_from_stdarg_alloca(first);
for (i = 0;; i++) {
assert_se(streq_ptr(l[i], j[i]));
if (!l[i])
break;
}
}
static void test_strv_from_stdarg_alloca(void) {
test_strv_from_stdarg_alloca_one((const char*[]) { "foo", "bar", NULL }, "foo", "bar", NULL);
test_strv_from_stdarg_alloca_one((const char*[]) { "foo", "bar", NULL }, "foo", "bar", NULL);
test_strv_from_stdarg_alloca_one((const char*[]) { "foo", NULL }, "foo", NULL);
}
int main(int argc, char *argv[]) {
test_specifier_printf();
test_strv_foreach();
@@ -346,6 +366,7 @@ int main(int argc, char *argv[]) {
test_strv_merge();
test_strv_merge_concat();
test_strv_append();
test_strv_from_stdarg_alloca();
return 0;
}