summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2015-03-17 12:20:31 +0100
committerDavid Herrmann <dh.herrmann@gmail.com>2015-03-19 14:12:00 +0100
commit33c2ce7b200747c172d4899c717a8e9097d84659 (patch)
tree5b15874c8e83e94987d7a79f221c2811ddcce7d8
parente0d065d4059181bfbf0aba81f780d32ba194c319 (diff)
strv: return NULL from strv_free()
We always return NULL/invalid-object from destructors, fix strv_free() to do the same.
-rw-r--r--src/shared/strv.c3
-rw-r--r--src/shared/strv.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/shared/strv.c b/src/shared/strv.c
index ee45ad1d0f..8c6ba6a633 100644
--- a/src/shared/strv.c
+++ b/src/shared/strv.c
@@ -80,9 +80,10 @@ void strv_clear(char **l) {
*l = NULL;
}
-void strv_free(char **l) {
+char **strv_free(char **l) {
strv_clear(l);
free(l);
+ return NULL;
}
char **strv_copy(char * const *l) {
diff --git a/src/shared/strv.h b/src/shared/strv.h
index 518c4c2aa8..a80ccd6427 100644
--- a/src/shared/strv.h
+++ b/src/shared/strv.h
@@ -31,7 +31,7 @@ char *strv_find(char **l, const char *name) _pure_;
char *strv_find_prefix(char **l, const char *name) _pure_;
char *strv_find_startswith(char **l, const char *name) _pure_;
-void strv_free(char **l);
+char **strv_free(char **l);
DEFINE_TRIVIAL_CLEANUP_FUNC(char**, strv_free);
#define _cleanup_strv_free_ _cleanup_(strv_freep)