summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/strv.h14
-rw-r--r--src/shared/util.h4
2 files changed, 9 insertions, 9 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);
diff --git a/src/shared/util.h b/src/shared/util.h
index d76f41e777..c0398f1aec 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -500,7 +500,7 @@ char *format_bytes(char *buf, size_t l, off_t t);
int fd_wait_for_event(int fd, int event, usec_t timeout);
-void* memdup(const void *p, size_t l) _malloc_;
+void* memdup(const void *p, size_t l);
int is_kernel_thread(pid_t pid);
@@ -567,7 +567,7 @@ _malloc_ static inline void *malloc_multiply(size_t a, size_t b) {
return malloc(a * b);
}
-_malloc_ static inline void *memdup_multiply(const void *p, size_t a, size_t b) {
+ static inline void *memdup_multiply(const void *p, size_t a, size_t b) {
if (_unlikely_(b == 0 || a > ((size_t) -1) / b))
return NULL;