diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2015-04-12 17:01:34 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2015-04-12 17:01:34 -0400 |
| commit | ff1acaf3c4473369707f19ac2fc132556c858db4 (patch) | |
| tree | 4a0d3f50fffd84aa57a505f878dba282b9a1fc71 | |
| parent | 36f74863add64c1d13ecb968b5004a97c6d64f7a (diff) | |
strv: return NULL from strv_free()
We always return NULL/invalid-object from destructors, fix strv_free() to
do the same.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | src/shared/strv.c | 3 | ||||
| -rw-r--r-- | src/shared/strv.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/shared/strv.c b/src/shared/strv.c index 5cfab8f23e..1f73134756 100644 --- a/src/shared/strv.c +++ b/src/shared/strv.c @@ -38,9 +38,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 94bdbe62aa..ed0bb2e372 100644 --- a/src/shared/strv.h +++ b/src/shared/strv.h @@ -24,7 +24,7 @@ #include "util.h" -void strv_free(char **l); +char **strv_free(char **l); DEFINE_TRIVIAL_CLEANUP_FUNC(char**, strv_free); #define _cleanup_strv_free_ _cleanup_(strv_freep) |