Merge branch 'python-systemd-reader'

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

diff --git a/src/shared/strv.h b/src/shared/strv.h
index fd728eff818b087cff05ec07b77c403aa94cf36b..623f10216dd8339f2d948f11d040022c5afd081c 100644 (file)
--- a/src/shared/strv.h
+++ b/src/shared/strv.h
@@ -58,21 +58,12 @@ 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_;
 
-char **strv_env_merge(unsigned n_lists, ...);
-char **strv_env_delete(char **x, unsigned n_lists, ...);
-
-char **strv_env_set(char **x, const char *p);
-char **strv_env_unset(char **l, const char *p);
-
-char *strv_env_get_with_length(char **l, const char *name, size_t k);
-char *strv_env_get(char **x, const char *n);
-
-char **strv_env_clean(char **l);
-
 char **strv_parse_nulstr(const char *s, size_t l);
+char **strv_split_nulstr(const char *s);
 
 bool strv_overlap(char **a, char **b);
 
@@ -87,3 +78,4 @@ bool strv_overlap(char **a, char **b);
 
 
 char **strv_sort(char **l);
+void strv_print(char **l);