X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fstrv.h;h=49058f8df8ff4fa9cd197b47280cd99039ea0182;hb=66e35261ef51119189486e9a31e7b97e8e18e255;hp=b3802a7a3ff6b6fcf93c3554843e6d315f66fd81;hpb=fabe5c0e5fce730aa66e10a9c4f9fdd443d7aeda;p=elogind.git diff --git a/src/shared/strv.h b/src/shared/strv.h index b3802a7a3..49058f8df 100644 --- a/src/shared/strv.h +++ b/src/shared/strv.h @@ -30,7 +30,10 @@ char *strv_find(char **l, const char *name); char *strv_find_prefix(char **l, const char *name); void strv_free(char **l); -void strv_freep(char ***l); +static inline void strv_freep(char ***l) { + strv_free(*l); +} + char **strv_copy(char **l) _malloc_; unsigned strv_length(char **l); @@ -58,6 +61,7 @@ static inline bool strv_isempty(char **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_join(char **l, const char *separator) _malloc_; @@ -73,7 +77,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);