X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fstrv.h;h=e35118752f4179e7ae4733a65fb03b48332cdf08;hb=b32ff512191bf873266ee8067f6f6c8a30c96a5e;hp=92696b02fa7709792678d2d480b3f7f017e92684;hpb=dfb33a9737e62ab872d3937b7690b252d2892fe8;p=elogind.git diff --git a/src/shared/strv.h b/src/shared/strv.h index 92696b02f..e35118752 100644 --- a/src/shared/strv.h +++ b/src/shared/strv.h @@ -26,8 +26,8 @@ #include "macro.h" -char *strv_find(char **l, const char *name); -char *strv_find_prefix(char **l, const char *name); +char *strv_find(char **l, const char *name) _pure_; +char *strv_find_prefix(char **l, const char *name) _pure_; void strv_free(char **l); static inline void strv_freep(char ***l) { @@ -36,8 +36,8 @@ static inline void strv_freep(char ***l) { #define _cleanup_strv_free_ _cleanup_(strv_freep) -char **strv_copy(char * const *l) _malloc_; -unsigned strv_length(char * const *l); +char **strv_copy(char * const *l); +unsigned strv_length(char * const *l) _pure_; char **strv_merge(char **a, char **b); char **strv_merge_concat(char **a, char **b, const char *suffix); @@ -51,8 +51,8 @@ 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_; +char **strv_new_ap(const char *x, va_list ap); static inline const char* STRV_IFNOTNULL(const char *x) { return x ? x : (const char *) -1; @@ -62,16 +62,16 @@ static inline bool strv_isempty(char * const *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_newlines(const char *s) _malloc_; +char **strv_split(const char *s, const char *separator); +char **strv_split_quoted(const char *s); +char **strv_split_newlines(const char *s); -char *strv_join(char **l, const char *separator) _malloc_; +char *strv_join(char **l, const char *separator); char **strv_parse_nulstr(const char *s, size_t l); char **strv_split_nulstr(const char *s); -bool strv_overlap(char **a, char **b); +bool strv_overlap(char **a, char **b) _pure_; #define STRV_FOREACH(s, l) \ for ((s) = (l); (s) && *(s); (s)++)