X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fconf-files.c;h=7ba4bee43bbc2efd091c405c6716f2335548eb53;hb=250a918dc4c8a15d927deecc3b3f6a0604657ae4;hp=ed4070c662711cb1e3ae7f009b336e3ad9f19b3e;hpb=7ff7394d9e4e9189c30fd018235e6b1728c6f2d0;p=elogind.git

diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
index ed4070c66..7ba4bee43 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);
 }