X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fstrv.h;h=4cd3865e1db5238b50d19fe099109d0c496c3561;hb=f10dda3b82dd493eada52bcc52b790a1cc1094e6;hp=da9fae6edb6d8c6450c582eda6dbf03036896ea6;hpb=a740c14c59907f370a6b3a3ba5a86fada88cb07e;p=elogind.git diff --git a/src/shared/strv.h b/src/shared/strv.h index da9fae6ed..4cd3865e1 100644 --- a/src/shared/strv.h +++ b/src/shared/strv.h @@ -34,13 +34,14 @@ static inline void strv_freep(char ***l) { strv_free(*l); } -char **strv_copy(char **l) _malloc_; -unsigned strv_length(char **l); +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); char **strv_append(char **l, const char *s); int strv_extend(char ***l, const char *value); +int strv_push(char ***l, char *value); char **strv_remove(char **l, const char *s); char **strv_remove_prefix(char **l, const char *s); @@ -55,7 +56,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; } @@ -77,7 +78,7 @@ bool strv_overlap(char **a, char **b); for (; (l) && ((s) >= (l)); (s)--) #define STRV_FOREACH_PAIR(x, y, l) \ - for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2) + for ((x) = (l), (y) = (x+1); (x) && *(x) && *(y); (x) += 2, (y) = (x + 1)) char **strv_sort(char **l);