summaryrefslogtreecommitdiff
path: root/src/strv.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-06-02 21:34:03 +0200
committerLennart Poettering <lennart@poettering.net>2010-06-02 21:34:03 +0200
commit93a46b0bc51cf2beb8523830ef7fd74aa0869673 (patch)
treee3554d764a22d8c971f13b635586b691bc63f889 /src/strv.h
parentf5644ae461dfed81fc1eb1212a15992be13b80fd (diff)
macro: avoid name clash with _unused on ppc
Diffstat (limited to 'src/strv.h')
-rw-r--r--src/strv.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/strv.h b/src/strv.h
index f0be83dd59..11d2ea1207 100644
--- a/src/strv.h
+++ b/src/strv.h
@@ -29,7 +29,7 @@
char *strv_find(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 +41,20 @@ 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(char **x, ...) _sentinel;
-char **strv_env_delete(char **x, ...) _sentinel;
+char **strv_env_merge(char **x, ...) _sentinel_;
+char **strv_env_delete(char **x, ...) _sentinel_;
#define STRV_FOREACH(s, l) \
for ((s) = (l); (s) && *(s); (s)++)