X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fstrv.h;h=22f8f98fdad09fc672ded27dba2eea1e732b7b60;hb=86e97d599f8b1ca379dce64fadac9b8f6b002ac5;hp=a899395ba4efb1ebc0c439a1b4474d75828b0e3d;hpb=bceccd5ecc393c344ab008737ba6aab211a5ea9f;p=elogind.git diff --git a/src/shared/strv.h b/src/shared/strv.h index a899395ba..22f8f98fd 100644 --- a/src/shared/strv.h +++ b/src/shared/strv.h @@ -31,7 +31,7 @@ char *strv_find(char **l, const char *name) _pure_; char *strv_find_prefix(char **l, const char *name) _pure_; char *strv_find_startswith(char **l, const char *name) _pure_; -void strv_free(char **l); +char **strv_free(char **l); DEFINE_TRIVIAL_CLEANUP_FUNC(char**, strv_free); #define _cleanup_strv_free_ _cleanup_(strv_freep) @@ -73,7 +73,7 @@ static inline bool strv_isempty(char * const *l) { char **strv_split(const char *s, const char *separator); char **strv_split_newlines(const char *s); -int strv_split_quoted(char ***t, const char *s, bool relax); +int strv_split_quoted(char ***t, const char *s, UnquoteFlags flags); char *strv_join(char **l, const char *separator); char *strv_join_quoted(char **l); @@ -146,10 +146,10 @@ void strv_print(char **l); char **strv_reverse(char **l); -bool strv_fnmatch(const char *s, char* const* patterns, int flags); +bool strv_fnmatch(char* const* patterns, const char *s, int flags); -static inline bool strv_fnmatch_or_empty(const char *s, char* const* patterns, int flags) { +static inline bool strv_fnmatch_or_empty(char* const* patterns, const char *s, int flags) { assert(s); return strv_isempty(patterns) || - strv_fnmatch(s, patterns, flags); + strv_fnmatch(patterns, s, flags); }