unit: get rid of various unnecessary casts

[elogind.git] / src / strv.h

diff --git a/src/strv.h b/src/strv.h
index f0be83dd59fed7107b4e93a8368824bf7984b921..0d50b02f012063059c742dbb219f92df5ff84adf 100644 (file)
--- a/src/strv.h
+++ b/src/strv.h
@@ -28,8 +28,10 @@
 #include "macro.h"
 
 char *strv_find(char **l, const char *name);
+char *strv_find_prefix(char **l, const char *name);
+
 void strv_free(char **l);
-char **strv_copy(char **l) _malloc;
+char **strv_copy(char **l) _malloc_;
 unsigned strv_length(char **l);
 
 char **strv_merge(char **a, char **b);
@@ -41,20 +43,22 @@ char **strv_uniq(char **l);
 
 #define strv_contains(l, s) (!!strv_find((l), (s)))
 
-char **strv_new(const char *x, ...) _sentinel _malloc;
-char **strv_new_ap(const char *x, va_list ap) _malloc;
+char **strv_new(const char *x, ...) _sentinel_ _malloc_;
+char **strv_new_ap(const char *x, va_list ap) _malloc_;
 
 static inline bool strv_isempty(char **l) {
         return !l || !*l;
 }
 
-char **strv_split(const char *s, const char *separator) _malloc;
-char **strv_split_quoted(const char *s) _malloc;
+char **strv_split(const char *s, const char *separator) _malloc_;
+char **strv_split_quoted(const char *s) _malloc_;
+
+char *strv_join(char **l, const char *separator) _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_merge(char **x, ...) _sentinel;
-char **strv_env_delete(char **x, ...) _sentinel;
+char **strv_env_set(char **x, const char *p);
 
 #define STRV_FOREACH(s, l)                      \
         for ((s) = (l); (s) && *(s); (s)++)