X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=strv.h;h=f0be83dd59fed7107b4e93a8368824bf7984b921;hp=603e0e72824dc4c73168adc05f80792c8b836384;hb=cb8a8f78a11cedb8cba1abfa9a63b0d3ea8eef93;hpb=15ae422b7471cf6f41ccf450243d8afd8ea0a054 diff --git a/strv.h b/strv.h index 603e0e728..f0be83dd5 100644 --- a/strv.h +++ b/strv.h @@ -29,7 +29,7 @@ char *strv_find(char **l, const char *name); void strv_free(char **l); -char **strv_copy(char **l); +char **strv_copy(char **l) _malloc; unsigned strv_length(char **l); char **strv_merge(char **a, char **b); @@ -41,19 +41,20 @@ char **strv_uniq(char **l); #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); +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); -char **strv_split_quoted(const char *s); +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); +char *strv_join(char **l, const char *separator) _malloc; char **strv_env_merge(char **x, ...) _sentinel; +char **strv_env_delete(char **x, ...) _sentinel; #define STRV_FOREACH(s, l) \ for ((s) = (l); (s) && *(s); (s)++)