Merge pull request #22 from elogind/dev_v232

[elogind.git] / src / basic / strv.c

diff --git a/src/basic/strv.c b/src/basic/strv.c
index baaa72e674dc98b3ca3126efc1e385019ef361d0..c98e956fd92ce7be1cfa5a8e55e0276f77f59163 100644 (file)
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -87,8 +87,7 @@ void strv_clear(char **l) {
 
 char **strv_free(char **l) {
         strv_clear(l);
-        free(l);
-        return NULL;
+        return mfree(l);
 }
 
 char **strv_free_erase(char **l) {
@@ -431,8 +430,7 @@ char *strv_join_quoted(char **l) {
         return buf;
 
  oom:
-        free(buf);
-        return NULL;
+        return mfree(buf);
 }
 #endif // 0
 
@@ -882,8 +880,7 @@ char ***strv_free_free(char ***l) {
         for (i = l; *i; i++)
                 strv_free(*i);
 
-        free(l);
-        return NULL;
+        return mfree(l);
 }
 
 char **strv_skip(char **l, size_t n) {