X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fstrv.c;h=1ef0b26a25b0d6eb091507e7c0281e53be484398;hp=2df478f30bbce900cb3e2b0673b61a1e4eada0c2;hb=e1d758033dc7e101ab32323a0f1649d8daf56a22;hpb=a6fde35332f5e7f78bff437d7b7bfded83debbaa

diff --git a/src/shared/strv.c b/src/shared/strv.c
index 2df478f30..1ef0b26a2 100644
--- a/src/shared/strv.c
+++ b/src/shared/strv.c
@@ -166,72 +166,38 @@ char **strv_new(const char *x, ...) {
         return r;
 }
 
-char **strv_merge(char **a, char **b) {
-        char **r, **k;
-
-        if (!a)
-                return strv_copy(b);
-
-        if (!b)
-                return strv_copy(a);
-
-        r = new(char*, strv_length(a) + strv_length(b) + 1);
-        if (!r)
-                return NULL;
-
-        for (k = r; *a; k++, a++) {
-                *k = strdup(*a);
-                if (!*k)
-                        goto fail;
-        }
+int strv_extend_strv(char ***a, char **b) {
+        int r;
+        char **s;
 
-        for (; *b; k++, b++) {
-                *k = strdup(*b);
-                if (!*k)
-                        goto fail;
+        STRV_FOREACH(s, b) {
+                r = strv_extend(a, *s);
+                if (r < 0)
+                        return r;
         }
 
-        *k = NULL;
-        return r;
-
-fail:
-        strv_free(r);
-        return NULL;
+        return 0;
 }
 
-char **strv_merge_concat(char **a, char **b, const char *suffix) {
-        char **r, **k;
-
-        /* Like strv_merge(), but appends suffix to all strings in b, before adding */
+int strv_extend_strv_concat(char ***a, char **b, const char *suffix) {
+        int r;
+        char **s;
 
-        if (!b)
-                return strv_copy(a);
+        STRV_FOREACH(s, b) {
+                char *v;
 
-        r = new(char*, strv_length(a) + strv_length(b) + 1);
-        if (!r)
-                return NULL;
+                v = strappend(*s, suffix);
+                if (!v)
+                        return -ENOMEM;
 
-        k = r;
-        if (a)
-                for (; *a; k++, a++) {
-                        *k = strdup(*a);
-                        if (!*k)
-                                goto fail;
+                r = strv_push(a, v);
+                if (r < 0) {
+                        free(v);
+                        return r;
                 }
-
-        for (; *b; k++, b++) {
-                *k = strappend(*b, suffix);
-                if (!*k)
-                        goto fail;
         }
 
-        *k = NULL;
-        return r;
-
-fail:
-        strv_free(r);
-        return NULL;
-
+        return 0;
 }
 
 char **strv_split(const char *s, const char *separator) {
@@ -393,52 +359,6 @@ char *strv_join_quoted(char **l) {
         return NULL;
 }
 
-char **strv_append(char **l, const char *s) {
-        char **r, **k;
-
-        if (!l)
-                return strv_new(s, NULL);
-
-        if (!s)
-                return strv_copy(l);
-
-        r = new(char*, strv_length(l)+2);
-        if (!r)
-                return NULL;
-
-        for (k = r; *l; k++, l++) {
-                *k = strdup(*l);
-                if (!*k)
-                        goto fail;
-        }
-
-        k[0] = strdup(s);
-        if (!k[0])
-                goto fail;
-
-        k[1] = NULL;
-        return r;
-
-fail:
-        strv_free(r);
-        return NULL;
-}
-
-char **strv_appendf(char **l, const char *format, ...) {
-        va_list ap;
-        _cleanup_free_ char *s = NULL;
-        int r;
-
-        va_start(ap, format);
-        r = vasprintf(&s, format, ap);
-        va_end(ap);
-
-        if (r < 0)
-                return NULL;
-
-        return strv_append(l, s);
-}
-
 int strv_push(char ***l, char *value) {
         char **c;
         unsigned n;
@@ -458,9 +378,18 @@ int strv_push(char ***l, char *value) {
         return 0;
 }
 
+int strv_consume(char ***l, char *value) {
+        int r;
+
+        r = strv_push(l, value);
+        if (r < 0)
+                free(value);
+
+        return r;
+}
+
 int strv_extend(char ***l, const char *value) {
         char *v;
-        int r;
 
         if (!value)
                 return 0;
@@ -469,11 +398,7 @@ int strv_extend(char ***l, const char *value) {
         if (!v)
                 return -ENOMEM;
 
-        r = strv_push(l, v);
-        if (r < 0)
-                free(v);
-
-        return r;
+        return strv_consume(l, v);
 }
 
 char **strv_uniq(char **l) {
@@ -499,40 +424,11 @@ char **strv_remove(char **l, const char *s) {
         /* Drops every occurrence of s in the string list, edits
          * in-place. */
 
-        for (f = t = l; *f; f++) {
-
-                if (streq(*f, s)) {
+        for (f = t = l; *f; f++)
+                if (streq(*f, s))
                         free(*f);
-                        continue;
-                }
-
-                *(t++) = *f;
-        }
-
-        *t = NULL;
-        return l;
-}
-
-char **strv_remove_prefix(char **l, const char *s) {
-        char **f, **t;
-
-        if (!l)
-                return NULL;
-
-        assert(s);
-
-        /* Drops every occurrence of a string prefixed with s in the
-         * string list, edits in-place. */
-
-        for (f = t = l; *f; f++) {
-
-                if (startswith(*f, s)) {
-                        free(*f);
-                        continue;
-                }
-
-                *(t++) = *f;
-        }
+                else
+                        *(t++) = *f;
 
         *t = NULL;
         return l;
@@ -546,7 +442,7 @@ char **strv_parse_nulstr(const char *s, size_t l) {
         assert(s || l <= 0);
 
         if (l <= 0)
-                return strv_new(NULL, NULL);
+                return new0(char*, 1);
 
         for (p = s; p < s + l; p++)
                 if (*p == 0)
@@ -601,14 +497,11 @@ char **strv_split_nulstr(const char *s) {
 }
 
 bool strv_overlap(char **a, char **b) {
-        char **i, **j;
+        char **i;
 
-        STRV_FOREACH(i, a) {
-                STRV_FOREACH(j, b) {
-                        if (streq(*i, *j))
-                                return true;
-                }
-        }
+        STRV_FOREACH(i, a)
+                if (strv_contains(b, *i))
+                        return true;
 
         return false;
 }
@@ -631,9 +524,21 @@ char **strv_sort(char **l) {
 void strv_print(char **l) {
         char **s;
 
-        if (!l)
-                return;
-
         STRV_FOREACH(s, l)
                 puts(*s);
 }
+
+int strv_extendf(char ***l, const char *format, ...) {
+        va_list ap;
+        char *x;
+        int r;
+
+        va_start(ap, format);
+        r = vasprintf(&x, format, ap);
+        va_end(ap);
+
+        if (r < 0)
+                return -ENOMEM;
+
+        return strv_consume(l, x);
+}