strv: introduce strv_new_ap() call

diff --git a/strv.c b/strv.c
index b5459a9867175763647adee4302f6e16cfc48cbb..ed5755a0d19dd797ca3a4ff7a627b33e16a9b345 100644 (file)
--- a/strv.c
+++ b/strv.c
@@ -85,21 +85,20 @@ unsigned strv_length(char **l) {
         return n;
 }
 
         return n;
 }
 

-char **strv_new(const char *x, ...) {
+char **strv_new_ap(const char *x, va_list ap) {

         const char *s;
         char **a;
         unsigned n = 0, i = 0;
         const char *s;
         char **a;
         unsigned n = 0, i = 0;

-        va_list ap;
+        va_list aq;
+

 
         if (x) {
                 n = 1;
 
 
         if (x) {
                 n = 1;
 

-                va_start(ap, x);
-
-                while (va_arg(ap, const char*))
+                va_copy(aq, ap);
+                while (va_arg(aq, const char*))

                         n++;
                         n++;

-
-                va_end(ap);
+                va_end(aq);

         }
 
         if (!(a = new(char*, n+1)))
         }
 
         if (!(a = new(char*, n+1)))


@@ -113,19 +112,16 @@ char **strv_new(const char *x, ...) {
 
                 i++;
 
 
                 i++;
 

-                va_start(ap, x);
-

                 while ((s = va_arg(ap, const char*))) {
                         if (!(a[i] = strdup(s)))
                                 goto fail;
 
                         i++;
                 }
                 while ((s = va_arg(ap, const char*))) {
                         if (!(a[i] = strdup(s)))
                                 goto fail;
 
                         i++;
                 }

-
-                va_end(ap);

         }
 
         a[i] = NULL;
         }
 
         a[i] = NULL;

+

         return a;
 
 fail:
         return a;
 
 fail:


@@ -135,9 +131,21 @@ fail:
                         free(a[i-1]);
 
         free(a);
                         free(a[i-1]);
 
         free(a);

+

         return NULL;
 }
 
         return NULL;
 }
 

+char **strv_new(const char *x, ...) {
+        char **r;
+        va_list ap;
+
+        va_start(ap, x);
+        r = strv_new_ap(x, ap);
+        va_end(ap);
+
+        return r;
+}
+

 char **strv_merge(char **a, char **b) {
         char **r, **k;
 
 char **strv_merge(char **a, char **b) {
         char **r, **k;
 

diff --git a/strv.h b/strv.h
index 9bdf287a2108b7ffcd8c6e55d4d7bfaf4aac4f1e..7ee9a95a8f5c68d35ebc46b0f9f389e9fe1d420c 100644 (file)
--- a/strv.h
+++ b/strv.h
@@ -39,6 +39,7 @@ char **strv_uniq(char **l);
 #define strv_contains(l, s) (!!strv_find((l), (s)))
 
 char **strv_new(const char *x, ...) _sentinel;
 #define strv_contains(l, s) (!!strv_find((l), (s)))
 
 char **strv_new(const char *x, ...) _sentinel;

+char **strv_new_ap(const char *x, va_list ap);

 
 static inline bool strv_isempty(char **l) {
         return !l || !*l;
 
 static inline bool strv_isempty(char **l) {
         return !l || !*l;