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

diff --git a/strv.h b/strv.h
index 43a5c5954..7a132ef68 100644
--- a/strv.h
+++ b/strv.h
@@ -3,6 +3,25 @@
 #ifndef foostrvhfoo
 #define foostrvhfoo
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 #include "macro.h"
 
 char *strv_find(char **l, const char *name);
@@ -10,10 +29,14 @@ void strv_free(char **l);
 char **strv_copy(char **l);
 unsigned strv_length(char **l);
 
-char **strv_new(const char *x, ...) __sentinel;
+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)--)