From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 19 Nov 2018 19:48:12 +0000 (+0100)
Subject: debug-generator: port over to using static destructors
X-Git-Tag: v240~275^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10845%2Fhead;p=thirdparty%2Fsystemd.git

debug-generator: port over to using static destructors
---

diff --git a/src/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c
index 8b6d26e19b0..73a8d352718 100644
--- a/src/debug-generator/debug-generator.c
+++ b/src/debug-generator/debug-generator.c
@@ -17,6 +17,10 @@ static char **arg_mask = NULL;
 static char **arg_wants = NULL;
 static bool arg_debug_shell = false;
 
+STATIC_DESTRUCTOR_REGISTER(arg_default_unit, freep);
+STATIC_DESTRUCTOR_REGISTER(arg_mask, strv_freep);
+STATIC_DESTRUCTOR_REGISTER(arg_wants, strv_freep);
+
 static int parse_proc_cmdline_item(const char *key, const char *value, void *data) {
         int r;
 
@@ -161,24 +165,14 @@ static int run(int argc, char *argv[]) {
 
         if (arg_debug_shell) {
                 r = strv_extend(&arg_wants, "debug-shell.service");
-                if (r < 0) {
-                        r = log_oom();
-                        goto finish;
-                }
+                if (r < 0)
+                        return log_oom();
         }
 
         r = generate_mask_symlinks();
-
         q = generate_wants_symlinks();
-        if (q < 0)
-                r = q;
-
-finish:
-        arg_default_unit = mfree(arg_default_unit);
-        strv_free(arg_wants);
-        strv_free(arg_mask);
 
-        return r;
+        return r < 0 ? r : q;
 }
 
 DEFINE_MAIN_FUNCTION(run);