X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fstrv.h;h=92696b02fa7709792678d2d480b3f7f017e92684;hb=a5e4972c8956cecf35fa4780e1cfe7c378bfcba1;hp=910d15337ff7933be4ef9dfb421029babb8a3c44;hpb=4468addca6d01a0d2d154371dd72f54307a9c786;p=elogind.git diff --git a/src/shared/strv.h b/src/shared/strv.h index 910d15337..92696b02f 100644 --- a/src/shared/strv.h +++ b/src/shared/strv.h @@ -34,8 +34,10 @@ static inline void strv_freep(char ***l) { strv_free(*l); } -char **strv_copy(char **l) _malloc_; -unsigned strv_length(char **l); +#define _cleanup_strv_free_ _cleanup_(strv_freep) + +char **strv_copy(char * const *l) _malloc_; +unsigned strv_length(char * const *l); char **strv_merge(char **a, char **b); char **strv_merge_concat(char **a, char **b, const char *suffix); @@ -56,7 +58,7 @@ static inline const char* STRV_IFNOTNULL(const char *x) { return x ? x : (const char *) -1; } -static inline bool strv_isempty(char **l) { +static inline bool strv_isempty(char * const *l) { return !l || !*l; }