diff options
| author | David Tardon <dtardon@redhat.com> | 2023-03-28 11:00:23 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2023-04-11 16:11:06 +0200 |
| commit | 9a57f69844808a7187ca2fd7e0aac0e43cacd6f9 (patch) | |
| tree | 2eeb00ba541c47d81a19e563f414ea1f6d6304a3 /src/systemctl | |
| parent | aa1c1ba1d6c1626c0b4d20697d1b49698836ec8a (diff) | |
| download | systemd-9a57f69844808a7187ca2fd7e0aac0e43cacd6f9.tar.gz | |
systemctl-enable: use CLEANUP_ARRAY
Diffstat (limited to 'src/systemctl')
| -rw-r--r-- | src/systemctl/systemctl-enable.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c index 0cc8cbb6b8..2fc5a0b051 100644 --- a/src/systemctl/systemctl-enable.c +++ b/src/systemctl/systemctl-enable.c @@ -70,6 +70,8 @@ int verb_enable(int argc, char *argv[], void *userdata) { bool ignore_carries_install_info = arg_quiet || arg_no_warn; int r; + CLEANUP_ARRAY(changes, n_changes, install_changes_free); + if (!argv[1]) return 0; @@ -130,8 +132,7 @@ int verb_enable(int argc, char *argv[], void *userdata) { install_changes_dump(r, verb, changes, n_changes, arg_quiet); if (r < 0) - goto finish; - 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; @@ -236,15 +237,14 @@ int verb_enable(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; /* Try to reload if enabled */ if (!arg_no_reload) { r = daemon_reload(ACTION_RELOAD, /* graceful= */ false); - if (r > 0) - r = 0; - } else - r = 0; + if (r < 0) + return r; + } } if (carries_install_info == 0 && !ignore_carries_install_info) @@ -306,7 +306,7 @@ int verb_enable(int argc, char *argv[], void *userdata) { r = acquire_bus(BUS_MANAGER, &bus); if (r < 0) - goto finish; + return r; len = strv_length(names); { @@ -321,8 +321,5 @@ int verb_enable(int argc, char *argv[], void *userdata) { } } -finish: - install_changes_free(changes, n_changes); - - return r; + return 0; } |