X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fstrv.h;h=b3802a7a3ff6b6fcf93c3554843e6d315f66fd81;hp=44ba3d1530e4514b53a23af5f1718f0cf5ffde18;hb=fabe5c0e5fce730aa66e10a9c4f9fdd443d7aeda;hpb=5926cccae202f1b8869017d4bdaf9e9ce371bba6

diff --git a/src/shared/strv.h b/src/shared/strv.h
index 44ba3d153..b3802a7a3 100644
--- a/src/shared/strv.h
+++ b/src/shared/strv.h
@@ -61,18 +61,8 @@ char **strv_split_quoted(const char *s) _malloc_;
 
 char *strv_join(char **l, const char *separator) _malloc_;
 
-char **strv_env_merge(unsigned n_lists, ...);
-char **strv_env_delete(char **x, unsigned n_lists, ...);
-
-char **strv_env_set(char **x, const char *p);
-char **strv_env_unset(char **l, const char *p);
-
-char *strv_env_get_with_length(char **l, const char *name, size_t k);
-char *strv_env_get(char **x, const char *n);
-
-char **strv_env_clean(char **l);
-
 char **strv_parse_nulstr(const char *s, size_t l);
+char **strv_split_nulstr(const char *s);
 
 bool strv_overlap(char **a, char **b);
 
@@ -82,4 +72,9 @@ bool strv_overlap(char **a, char **b);
 #define STRV_FOREACH_BACKWARDS(s, l)            \
         for (; (l) && ((s) >= (l)); (s)--)
 
+#define STRV_FOREACH_PAIR(x, y, l)               \
+        for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2)
+
+
 char **strv_sort(char **l);
+void strv_print(char **l);