Merge pull request #27424 from dtardon/auto-cleanup

More automatic cleanup
2023-04-28 18:46:36 +09:00
parent c63dde8099 360179ea46
commit 75fd8ad008
15 changed files with 106 additions and 112 deletions
@@ -464,7 +464,8 @@ int specifier_var_tmp_dir(char specifier, const void *data, const char *root, co
 }

 int specifier_escape_strv(char **l, char ***ret) {
-        char **z, **p, **q;
+        _cleanup_strv_free_ char **z = NULL;
+        char **p, **q;

        assert(ret);

@@ -480,14 +481,12 @@ int specifier_escape_strv(char **l, char ***ret) {
        for (p = l, q = z; *p; p++, q++) {

                *q = specifier_escape(*p);
-                if (!*q) {
-                        strv_free(z);
+                if (!*q)
                        return -ENOMEM;
-                }
        }

        *q = NULL;
-        *ret = z;
+        *ret = TAKE_PTR(z);

        return 0;
 }