X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fstrv.h;h=d90527c6f6855ef23820d7ab1a0b31952c22bce4;hb=c5729796b4ec5e5f4800bfe6bd9ceb5c2da81fbe;hp=2dbd6d7f5fd58fadad42517d74763c0bac7aa9d4;hpb=21ecddbbb2c9e06d080b2526a870898a8b90f52a;p=elogind.git

diff --git a/src/basic/strv.h b/src/basic/strv.h
index 2dbd6d7f5..d90527c6f 100644
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -21,10 +21,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <fnmatch.h>
 #include <stdarg.h>
 #include <stdbool.h>
-#include <fnmatch.h>
 
+#include "extract-word.h"
 #include "util.h"
 
 char *strv_find(char **l, const char *name) _pure_;
@@ -35,27 +36,43 @@ char **strv_free(char **l);
 DEFINE_TRIVIAL_CLEANUP_FUNC(char**, strv_free);
 #define _cleanup_strv_free_ _cleanup_(strv_freep)
 
+char **strv_free_erase(char **l);
+DEFINE_TRIVIAL_CLEANUP_FUNC(char**, strv_free_erase);
+#define _cleanup_strv_free_erase_ _cleanup_(strv_free_erasep)
+
 void strv_clear(char **l);
 
 char **strv_copy(char * const *l);
 unsigned strv_length(char * const *l) _pure_;
 
-int strv_extend_strv(char ***a, char **b);
-// UNNEEDED int strv_extend_strv_concat(char ***a, char **b, const char *suffix);
+int strv_extend_strv(char ***a, char **b, bool filter_duplicates);
+/// UNNEEDED by elogind
+#if 0
+int strv_extend_strv_concat(char ***a, char **b, const char *suffix);
+#endif // 0
 int strv_extend(char ***l, const char *value);
-// UNNEEDED int strv_extendf(char ***l, const char *format, ...) _printf_(2,0);
+/// UNNEEDED by elogind
+#if 0
+int strv_extendf(char ***l, const char *format, ...) _printf_(2,0);
+#endif // 0
 int strv_push(char ***l, char *value);
 int strv_push_pair(char ***l, char *a, char *b);
 int strv_push_prepend(char ***l, char *value);
 int strv_consume(char ***l, char *value);
-// UNNEEDED int strv_consume_pair(char ***l, char *a, char *b);
+/// UNNEEDED by elogind
+#if 0
+int strv_consume_pair(char ***l, char *a, char *b);
+#endif // 0
 int strv_consume_prepend(char ***l, char *value);
 
 char **strv_remove(char **l, const char *s);
 char **strv_uniq(char **l);
-// UNNEEDED bool strv_is_uniq(char **l);
+/// UNNEEDED by elogind
+#if 0
+bool strv_is_uniq(char **l);
 
-// UNNEEDED bool strv_equal(char **a, char **b);
+bool strv_equal(char **a, char **b);
+#endif // 0
 
 #define strv_contains(l, s) (!!strv_find((l), (s)))
 
@@ -71,18 +88,26 @@ static inline bool strv_isempty(char * const *l) {
 }
 
 char **strv_split(const char *s, const char *separator);
-// UNNEEDED char **strv_split_newlines(const char *s);
-
-// UNNEEDED int strv_split_quoted(char ***t, const char *s, UnquoteFlags flags);
+/// UNNEEDED by elogind
+#if 0
+char **strv_split_newlines(const char *s);
 
+int strv_split_extract(char ***t, const char *s, const char *separators, ExtractFlags flags);
+#endif // 0
 char *strv_join(char **l, const char *separator);
-// UNNEEDED char *strv_join_quoted(char **l);
+/// UNNEEDED by elogind
+#if 0
+char *strv_join_quoted(char **l);
+#endif // 0
 
 char **strv_parse_nulstr(const char *s, size_t l);
 char **strv_split_nulstr(const char *s);
+/// UNNEEDED by elogind
+#if 0
+int strv_make_nulstr(char **l, char **p, size_t *n);
 
 bool strv_overlap(char **a, char **b) _pure_;
-
+#endif // 0
 #define STRV_FOREACH(s, l)                      \
         for ((s) = (l); (s) && *(s); (s)++)
 
@@ -95,7 +120,10 @@ bool strv_overlap(char **a, char **b) _pure_;
         for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1))
 
 char **strv_sort(char **l);
+/// UNNEEDED by elogind
+#if 0
 void strv_print(char **l);
+#endif // 0
 
 #define STRV_MAKE(...) ((char**) ((const char*[]) { __VA_ARGS__, NULL }))
 
@@ -144,7 +172,9 @@ void strv_print(char **l);
                 _l[0];                                       \
         }))
 
-// UNNEEDED char **strv_reverse(char **l);
+/// UNNEEDED by elogind
+#if 0
+char **strv_reverse(char **l);
 char **strv_shell_escape(char **l, const char *bad);
 
 bool strv_fnmatch(char* const* patterns, const char *s, int flags);
@@ -154,3 +184,10 @@ static inline bool strv_fnmatch_or_empty(char* const* patterns, const char *s, i
         return strv_isempty(patterns) ||
                strv_fnmatch(patterns, s, flags);
 }
+
+char ***strv_free_free(char ***l);
+
+char **strv_skip(char **l, size_t n);
+
+int strv_extend_n(char ***l, const char *value, size_t n);
+#endif // 0