SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

machinectl: use CLEANUP_ARRAY

Browse Source
This commit is contained in:
David Tardon
2023-04-11 15:31:50 +02:00
parent 2a711edd87
commit ffddb3c945
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/machine/machinectl.c
+12 -19
View File
@@ -1763,6 +1763,8 @@ static int enable_machine(int argc, char *argv[], void *userdata) {
sd_bus *bus = ASSERT_PTR(userdata);
int r;
CLEANUP_ARRAY(changes, n_changes, install_changes_free);
polkit_agent_open_if_enabled(arg_transport, arg_ask_password);
method = streq(argv[0], "enable") ? "EnableUnitFiles" : "DisableUnitFiles";
@@ -1824,39 +1826,30 @@ static int enable_machine(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;
r = bus_call_method(bus, bus_systemd_mgr, "Reload", &error, NULL, NULL);
if (r < 0) {
log_error("Failed to reload daemon: %s", bus_error_message(&error, r));
goto finish;
}
if (r < 0)
return log_error_errno(r, "Failed to reload daemon: %s", bus_error_message(&error, r));
if (arg_now) {
_cleanup_strv_free_ char **new_args = NULL;
new_args = strv_new(streq(argv[0], "enable") ? "start" : "poweroff");
if (!new_args) {
r = log_oom();
goto finish;
}
if (!new_args)
return log_oom();
r = strv_extend_strv(&new_args, argv + 1, /* filter_duplicates = */ false);
if (r < 0) {
log_oom();
goto finish;
}
if (r < 0)
return log_oom();
if (streq(argv[0], "enable"))
r = start_machine(strv_length(new_args), new_args, userdata);
return start_machine(strv_length(new_args), new_args, userdata);
else
r = poweroff_machine(strv_length(new_args), new_args, userdata);
return poweroff_machine(strv_length(new_args), new_args, userdata);
}
finish:
install_changes_free(changes, n_changes);
return r;
return 0;
}
static int match_log_message(sd_bus_message *m, void *userdata, sd_bus_error *error) {