X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fstrv.h;h=92696b02fa7709792678d2d480b3f7f017e92684;hb=e8e581bf256b8c0fbd430935af79fa0e8ee570a1;hp=d28625bd2f6ec9747fb843c151d538d2ef38ba1a;hpb=4d1a69043862ed979642f5688097160355d4cc81;p=elogind.git

diff --git a/src/shared/strv.h b/src/shared/strv.h
index d28625bd2..92696b02f 100644
--- a/src/shared/strv.h
+++ b/src/shared/strv.h
@@ -30,14 +30,20 @@ char *strv_find(char **l, const char *name);
 char *strv_find_prefix(char **l, const char *name);
 
 void strv_free(char **l);
-void strv_freep(char ***l);
-char **strv_copy(char **l) _malloc_;
-unsigned strv_length(char **l);
+static inline void strv_freep(char ***l) {
+        strv_free(*l);
+}
+
+#define _cleanup_strv_free_ _cleanup_(strv_freep)
+
+char **strv_copy(char * const *l) _malloc_;
+unsigned strv_length(char * const *l);
 
 char **strv_merge(char **a, char **b);
 char **strv_merge_concat(char **a, char **b, const char *suffix);
 char **strv_append(char **l, const char *s);
 int strv_extend(char ***l, const char *value);
+int strv_push(char ***l, char *value);
 
 char **strv_remove(char **l, const char *s);
 char **strv_remove_prefix(char **l, const char *s);
@@ -52,16 +58,18 @@ static inline const char* STRV_IFNOTNULL(const char *x) {
         return x ? x : (const char *) -1;
 }
 
-static inline bool strv_isempty(char **l) {
+static inline bool strv_isempty(char * const *l) {
         return !l || !*l;
 }
 
 char **strv_split(const char *s, const char *separator) _malloc_;
 char **strv_split_quoted(const char *s) _malloc_;
+char **strv_split_newlines(const char *s) _malloc_;
 
 char *strv_join(char **l, const char *separator) _malloc_;
 
 char **strv_parse_nulstr(const char *s, size_t l);
+char **strv_split_nulstr(const char *s);
 
 bool strv_overlap(char **a, char **b);
 
@@ -72,7 +80,7 @@ bool strv_overlap(char **a, char **b);
         for (; (l) && ((s) >= (l)); (s)--)
 
 #define STRV_FOREACH_PAIR(x, y, l)               \
-        for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2)
+        for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1))
 
 
 char **strv_sort(char **l);