From 250a918dc4c8a15d927deecc3b3f6a0604657ae4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 29 Oct 2013 19:53:43 +0100 Subject: strv: introduce new strv_from_stdarg_alloca() macro to generate a string array from stdarg function parameters This allows us to turn lists of strings passed in easily into string arrays without having to allocate memory. --- src/shared/conf-files.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/shared/conf-files.c') diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c index ed4070c662..7ba4bee43b 100644 --- a/src/shared/conf-files.c +++ b/src/shared/conf-files.c @@ -148,18 +148,12 @@ int conf_files_list_strv(char ***strv, const char *suffix, const char *root, con } int conf_files_list(char ***strv, const char *suffix, const char *root, const char *dir, ...) { - _cleanup_strv_free_ char **dirs = NULL; - va_list ap; + char **dirs; assert(strv); assert(suffix); - va_start(ap, dir); - dirs = strv_new_ap(dir, ap); - va_end(ap); - - if (!dirs) - return -ENOMEM; + dirs = strv_from_stdarg_alloca(dir); return conf_files_list_strv_internal(strv, suffix, root, dirs); } -- cgit v1.2.3-54-g00ecf