X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fstrv.h;h=3034073d3288e5a28871769b4561b4d53d70837c;hp=618951c5e32f4045bd0b78966104d6143a34fa9c;hb=623a4c97b9175f95c4b1c6fc34e36c56f1e4ddbf;hpb=53ede806cb58c661efbee6bbaabee6b2f0d3ce79 diff --git a/src/shared/strv.h b/src/shared/strv.h index 618951c5e..3034073d3 100644 --- a/src/shared/strv.h +++ b/src/shared/strv.h @@ -39,8 +39,11 @@ unsigned strv_length(char * const *l) _pure_; int strv_extend_strv(char ***a, char **b); int strv_extend_strv_concat(char ***a, char **b, const char *suffix); int strv_extend(char ***l, const char *value); +int strv_extendf(char ***l, const char *format, ...) _printf_(2,0); int strv_push(char ***l, char *value); +int strv_push_prepend(char ***l, char *value); int strv_consume(char ***l, char *value); +int strv_consume_prepend(char ***l, char *value); char **strv_remove(char **l, const char *s); char **strv_uniq(char **l); @@ -118,3 +121,15 @@ void strv_print(char **l); }) #define STR_IN_SET(x, ...) strv_contains(STRV_MAKE(__VA_ARGS__), x) + +#define FOREACH_STRING(x, ...) \ + for (char **_l = ({ \ + char **_ll = STRV_MAKE(__VA_ARGS__); \ + x = _ll ? _ll[0] : NULL; \ + _ll; \ + }); \ + _l && *_l; \ + x = ({ \ + _l ++; \ + _l[0]; \ + }))