fstab-generator: merge /proc/cmdline parsing loops into one

[elogind.git] / src / shared / strv.h

diff --git a/src/shared/strv.h b/src/shared/strv.h
index daf9ad0d0bdaddf89b309728fb5df09956e9adcf..b356d034c6df6734ef74f636bbe677a7f30cb0f3 100644 (file)
--- a/src/shared/strv.h
+++ b/src/shared/strv.h
@@ -36,14 +36,14 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(char**, strv_free);
 char **strv_copy(char * const *l);
 unsigned strv_length(char * const *l) _pure_;
 
-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_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_consume(char ***l, char *value);
 
 char **strv_remove(char **l, const char *s);
-char **strv_remove_prefix(char **l, const char *s);
 char **strv_uniq(char **l);
 
 #define strv_contains(l, s) (!!strv_find((l), (s)))
@@ -117,3 +117,5 @@ void strv_print(char **l);
                 }                                               \
                 _l;                                             \
         })
+
+#define STR_IN_SET(x, ...) strv_contains(STRV_MAKE(__VA_ARGS__), x)