X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=strv.h;h=7ee9a95a8f5c68d35ebc46b0f9f389e9fe1d420c;hp=abe91925456f177050201dd5e01149b36d5269ed;hb=257eca1a9c2d0ef110c21e74952e9723d778e267;hpb=a7334b0952ab66c17ee787e36e6d2c5ceb387de6 diff --git a/strv.h b/strv.h index abe919254..7ee9a95a8 100644 --- a/strv.h +++ b/strv.h @@ -30,10 +30,27 @@ char **strv_copy(char **l); unsigned strv_length(char **l); char **strv_merge(char **a, char **b); +char **strv_merge_concat(char **a, char **b, const char *suffix); +char **strv_append(char **l, const char *s); -bool strv_contains(char **l, const char *s); +char **strv_remove(char **l, const char *s); +char **strv_uniq(char **l); -char **strv_new(const char *x, ...) __sentinel; +#define strv_contains(l, s) (!!strv_find((l), (s))) + +char **strv_new(const char *x, ...) _sentinel; +char **strv_new_ap(const char *x, va_list ap); + +static inline bool strv_isempty(char **l) { + return !l || !*l; +} + +char **strv_split(const char *s, const char *separator); +char **strv_split_quoted(const char *s); + +char *strv_join(char **l, const char *separator); + +char **strv_env_merge(char **x, ...) _sentinel; #define STRV_FOREACH(s, l) \ for ((s) = (l); (s) && *(s); (s)++)