X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=strv.h;h=9cd8732b4f8fb7f66c69c9ea290e6ca09dadd183;hb=2e2ca209f0242044d405cadde05da92e6dad1a6d;hp=9bdf287a2108b7ffcd8c6e55d4d7bfaf4aac4f1e;hpb=2e6c9e6bdee8ebc9d34095b6f542603a217498e0;p=elogind.git
diff --git a/strv.h b/strv.h
index 9bdf287a2..9cd8732b4 100644
--- a/strv.h
+++ b/strv.h
@@ -22,11 +22,14 @@
along with systemd; If not, see .
***/
+#include
+#include
+
#include "macro.h"
char *strv_find(char **l, const char *name);
void strv_free(char **l);
-char **strv_copy(char **l);
+char **strv_copy(char **l) _malloc;
unsigned strv_length(char **l);
char **strv_merge(char **a, char **b);
@@ -38,16 +41,17 @@ char **strv_uniq(char **l);
#define strv_contains(l, s) (!!strv_find((l), (s)))
-char **strv_new(const char *x, ...) _sentinel;
+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);
-char **strv_split_quoted(const char *s);
+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);
+char *strv_join(char **l, const char *separator) _malloc;
char **strv_env_merge(char **x, ...) _sentinel;