From: David Tardon <dtardon@redhat.com>
Date: Tue, 28 Mar 2023 08:51:29 +0000 (+0200)
Subject: systemctl-add-dependency: use CLEANUP_ARRAY
X-Git-Tag: v254-rc1~752^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a372f9f16b8b22ae8206d4a311adf8e46d696a29;p=thirdparty%2Fsystemd.git

systemctl-add-dependency: use CLEANUP_ARRAY
---

diff --git a/src/systemctl/systemctl-add-dependency.c b/src/systemctl/systemctl-add-dependency.c
index 4bbcd7a13ba..c5227c86592 100644
--- a/src/systemctl/systemctl-add-dependency.c
+++ b/src/systemctl/systemctl-add-dependency.c
@@ -16,6 +16,8 @@ int verb_add_dependency(int argc, char *argv[], void *userdata) {
         UnitDependency dep;
         int r;
 
+        CLEANUP_ARRAY(changes, n_changes, install_changes_free);
+
         if (!argv[1])
                 return 0;
 
@@ -39,9 +41,8 @@ int verb_add_dependency(int argc, char *argv[], void *userdata) {
         if (install_client_side()) {
                 r = unit_file_add_dependency(arg_runtime_scope, unit_file_flags_from_args(), arg_root, names, target, dep, &changes, &n_changes);
                 install_changes_dump(r, "add dependency on", changes, n_changes, arg_quiet);
-
-                if (r > 0)
-                        r = 0;
+                if (r < 0)
+                        return r;
         } else {
                 _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL, *m = NULL;
                 _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
@@ -71,20 +72,15 @@ int verb_add_dependency(int argc, char *argv[], void *userdata) {
 
                 r = bus_deserialize_and_dump_unit_file_changes(reply, arg_quiet, &changes, &n_changes);
                 if (r < 0)
-                        goto finish;
+                        return r;
 
-                if (arg_no_reload) {
-                        r = 0;
-                        goto finish;
-                }
+                if (arg_no_reload)
+                        return 0;
 
                 r = daemon_reload(ACTION_RELOAD, /* graceful= */ false);
-                if (r > 0)
-                        r = 0;
+                if (r < 0)
+                        return r;
         }
 
-finish:
-        install_changes_free(changes, n_changes);
-
-        return r;
+        return 0;
 }