X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fstrv.h;h=064576ce1ea6f6ed890822d5468e585261d5f65d;hp=f0be83dd59fed7107b4e93a8368824bf7984b921;hb=b4353094e5097c0cb149b5adcffe2a6ba9240283;hpb=e99e38bbdcca3fe5956823bdb3d38544ccf93221

diff --git a/src/strv.h b/src/strv.h
index f0be83dd5..064576ce1 100644
--- a/src/strv.h
+++ b/src/strv.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foostrvhfoo
 #define foostrvhfoo
@@ -28,8 +28,10 @@
 #include "macro.h"
 
 char *strv_find(char **l, const char *name);
+char *strv_find_prefix(char **l, const char *name);
+
 void strv_free(char **l);
-char **strv_copy(char **l) _malloc;
+char **strv_copy(char **l) _malloc_;
 unsigned strv_length(char **l);
 
 char **strv_merge(char **a, char **b);
@@ -41,20 +43,29 @@ char **strv_uniq(char **l);
 
 #define strv_contains(l, s) (!!strv_find((l), (s)))
 
-char **strv_new(const char *x, ...) _sentinel _malloc;
-char **strv_new_ap(const char *x, va_list ap) _malloc;
+char **strv_new(const char *x, ...) _sentinel_ _malloc_;
+char **strv_new_ap(const char *x, va_list ap) _malloc_;
 
 static inline bool strv_isempty(char **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(const char *s, const char *separator) _malloc_;
+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_get_with_length(char **l, const char *name, size_t k);
+char *strv_env_get(char **x, const char *n);
 
-char *strv_join(char **l, const char *separator) _malloc;
+char **strv_env_clean(char **l);
 
-char **strv_env_merge(char **x, ...) _sentinel;
-char **strv_env_delete(char **x, ...) _sentinel;
+char **strv_parse_nulstr(const char *s, size_t l);
 
 #define STRV_FOREACH(s, l)                      \
         for ((s) = (l); (s) && *(s); (s)++)