summaryrefslogtreecommitdiff
path: root/src/shared/strv.h
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-04-25 19:47:43 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-04-25 21:28:05 -0400
commitb231b54780dfa687fc116ed436790c87d5557188 (patch)
treeb5c8971d6a64f260519db72779e285452d45c5f0 /src/shared/strv.h
parentb5edbff0356c0b161c46992d9e298866e54c448c (diff)
Remove erroneous attribute((malloc)) annotations
According to gcc documentation, returned pointer "cannot alias any other pointer valid when the function returns" and "the memory has undefined content". This second part is (hopefully) untrue for all those functions.
Diffstat (limited to 'src/shared/strv.h')
-rw-r--r--src/shared/strv.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/shared/strv.h b/src/shared/strv.h
index 92696b02fa..73ee416b1b 100644
--- a/src/shared/strv.h
+++ b/src/shared/strv.h
@@ -36,7 +36,7 @@ static inline void strv_freep(char ***l) {
#define _cleanup_strv_free_ _cleanup_(strv_freep)
-char **strv_copy(char * const *l) _malloc_;
+char **strv_copy(char * const *l);
unsigned strv_length(char * const *l);
char **strv_merge(char **a, char **b);
@@ -51,8 +51,8 @@ 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_;
+char **strv_new_ap(const char *x, va_list ap);
static inline const char* STRV_IFNOTNULL(const char *x) {
return x ? x : (const char *) -1;
@@ -62,11 +62,11 @@ static inline bool strv_isempty(char * const *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_newlines(const char *s) _malloc_;
+char **strv_split(const char *s, const char *separator);
+char **strv_split_quoted(const char *s);
+char **strv_split_newlines(const char *s);
-char *strv_join(char **l, const char *separator) _malloc_;
+char *strv_join(char **l, const char *separator);
char **strv_parse_nulstr(const char *s, size_t l);
char **strv_split_nulstr(const char *s);