picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

strv: return NULL from strv_free()

Browse source 
We always return NULL/invalid-object from destructors, fix strv_free() to
do the same.
This commit is contained in:
David Herrmann 2015-03-17 12:20:31 +01:00
parent e0d065d405
commit 33c2ce7b20
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/shared/strv.c
View file

@ -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) {

2
src/shared/strv.h
View file

@ -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)