summaryrefslogtreecommitdiff
path: root/src/shared/conf-files.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared/conf-files.c')
-rw-r--r--src/shared/conf-files.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
index 7ba4bee43b..ed4070c662 100644
--- a/src/shared/conf-files.c
+++ b/src/shared/conf-files.c
@@ -148,12 +148,18 @@ 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, ...) {
- char **dirs;
+ _cleanup_strv_free_ char **dirs = NULL;
+ va_list ap;
assert(strv);
assert(suffix);
- dirs = strv_from_stdarg_alloca(dir);
+ va_start(ap, dir);
+ dirs = strv_new_ap(dir, ap);
+ va_end(ap);
+
+ if (!dirs)
+ return -ENOMEM;
return conf_files_list_strv_internal(strv, suffix, root, dirs);
}