X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fstrv.h;h=8cb35ef395952c60d385d54f365864bf308bb826;hp=f0be83dd59fed7107b4e93a8368824bf7984b921;hb=73c33e7f225f81e6066386fba997e8ea2ba361b3;hpb=e99e38bbdcca3fe5956823bdb3d38544ccf93221 diff --git a/src/strv.h b/src/strv.h index f0be83dd5..8cb35ef39 100644 --- a/src/strv.h +++ b/src/strv.h @@ -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,25 @@ 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_join(char **l, const char *separator) _malloc; +char **strv_env_set(char **x, const char *p); -char **strv_env_merge(char **x, ...) _sentinel; -char **strv_env_delete(char **x, ...) _sentinel; +char *strv_env_get_with_length(char **l, const char *name, size_t k); +char *strv_env_get(char **x, const char *n); #define STRV_FOREACH(s, l) \ for ((s) = (l); (s) && *(s); (s)++)