X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fstrv.h;h=bb84095528739b26d0073424eaffc04bf250a492;hb=2b5cdb47b5a4a367bc2be8fe4457423f785884f0;hp=682bb3f7513fead192e991d675ae3290d9c4c122;hpb=c286398e07a7a16aa88a3437318cb2edf8c082c1;p=elogind.git
diff --git a/src/basic/strv.h b/src/basic/strv.h
index 682bb3f75..bb8409552 100644
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -21,10 +21,14 @@
along with systemd; If not, see .
***/
+#include
#include
#include
-#include
+#include
+#include "extract-word.h"
+#include "alloc-util.h"
+#include "macro.h"
#include "util.h"
char *strv_find(char **l, const char *name) _pure_;
@@ -35,27 +39,39 @@ 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);
+#if 0 /// UNNEEDED by elogind
+int strv_extend_strv(char ***a, char **b, bool filter_duplicates);
+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);
+#if 0 /// UNNEEDED by elogind
+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);
+#if 0 /// UNNEEDED by elogind
+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);
+#if 0 /// UNNEEDED by elogind
+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 +87,23 @@ 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);
+#if 0 /// UNNEEDED by elogind
+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);
+#if 0 /// UNNEEDED by elogind
+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);
+#if 0 /// UNNEEDED by elogind
+int strv_make_nulstr(char **l, char **p, size_t *n);
-// UNNEEDED bool strv_overlap(char **a, char **b) _pure_;
-
+bool strv_overlap(char **a, char **b) _pure_;
+#endif // 0
#define STRV_FOREACH(s, l) \
for ((s) = (l); (s) && *(s); (s)++)
@@ -94,8 +115,10 @@ char **strv_split_nulstr(const char *s);
#define STRV_FOREACH_PAIR(x, y, l) \
for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1))
-// UNNEEDED char **strv_sort(char **l);
-// UNNEEDED void strv_print(char **l);
+char **strv_sort(char **l);
+#if 0 /// UNNEEDED by elogind
+void strv_print(char **l);
+#endif // 0
#define STRV_MAKE(...) ((char**) ((const char*[]) { __VA_ARGS__, NULL }))
@@ -144,8 +167,9 @@ char **strv_split_nulstr(const char *s);
_l[0]; \
}))
-// UNNEEDED char **strv_reverse(char **l);
-// UNNEEDED char **strv_shell_escape(char **l, const char *bad);
+#if 0 /// UNNEEDED by elogind
+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 +178,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