X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=strv.h;h=cc21eb19303010cac2c79a9bafeef17cbece5928;hb=9eba9da4bce4778b4d5dd43e2c41756976a1582b;hp=43a5c5954b8b959a3f29895e5d36a4016d0df713;hpb=6091827530d6dd43479d6709fb6e9f745c11e900;p=elogind.git

diff --git a/strv.h b/strv.h
index 43a5c5954..cc21eb193 100644
--- a/strv.h
+++ b/strv.h
@@ -10,10 +10,14 @@ void strv_free(char **l);
 char **strv_copy(char **l);
 unsigned strv_length(char **l);
 
+char **strv_merge(char **a, char **b);
+
+bool strv_contains(char **l, const char *s);
+
 char **strv_new(const char *x, ...) __sentinel;
 
 #define STRV_FOREACH(s, l)                      \
-        for ((s) = (l); (l) && *(s); (s)++)
+        for ((s) = (l); (s) && *(s); (s)++)
 
 #define STRV_FOREACH_BACKWARDS(s, l)            \
         for (; (l) && ((s) >= (l)); (s)--)