system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 12:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemctl: minor modernization

Browse source
This commit is contained in:
Mike Yuan 2023-10-17 20:35:31 +08:00
parent 81c1c387fe
commit def1e20a18
No known key found for this signature in database
GPG key ID: 417471C0A40F58B3
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/systemctl/systemctl-cancel-job.c
View file

@ -21,6 +21,8 @@ int verb_cancel(int argc, char *argv[], void *userdata) {
polkit_agent_open_maybe();
r = 0;
STRV_FOREACH(name, strv_skip(argv, 1)) {
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
uint32_t id;
@ -32,9 +34,9 @@ int verb_cancel(int argc, char *argv[], void *userdata) {
q = bus_call_method(bus, bus_systemd_mgr, "CancelJob", &error, NULL, "u", id);
if (q < 0) {
log_error_errno(q, "Failed to cancel job %"PRIu32": %s", id, bus_error_message(&error, q));
if (r == 0)
r = q;
log_warning_errno(q, "Failed to cancel job %"PRIu32", ignoring: %s",
id, bus_error_message(&error, q));
RET_GATHER(r, q);
}
}

11
src/systemctl/systemctl-is-active.c
View file

@ -9,7 +9,7 @@
#include "systemctl-util.h"
#include "systemctl.h"
static int check_unit_generic(int code, const UnitActiveState good_states[], int nb_states, char **args) {
static int check_unit_generic(int code, const UnitActiveState good_states[], size_t nb_states, char **args) {
_cleanup_strv_free_ char **names = NULL;
UnitActiveState active_state;
sd_bus *bus;
@ -38,8 +38,8 @@ static int check_unit_generic(int code, const UnitActiveState good_states[], int
if (!arg_quiet)
puts(unit_active_state_to_string(active_state));
for (int i = 0; i < nb_states; ++i)
if (good_states[i] == active_state) {
FOREACH_ARRAY(good_state, good_states, nb_states)
if (active_state == *good_state) {
ok = true;
break;
}
@ -48,12 +48,12 @@ static int check_unit_generic(int code, const UnitActiveState good_states[], int
not_found = false;
}
/* We use LSB code 4 ("program or service status is unknown")
* when the corresponding unit file doesn't exist. */
/* We use LSB code 4 ("program or service status is unknown") when the corresponding unit file doesn't exist. */
return ok ? EXIT_SUCCESS : not_found ? EXIT_PROGRAM_OR_SERVICES_STATUS_UNKNOWN : code;
}
int verb_is_active(int argc, char *argv[], void *userdata) {
static const UnitActiveState states[] = {
UNIT_ACTIVE,
UNIT_RELOADING,
@ -64,6 +64,7 @@ int verb_is_active(int argc, char *argv[], void *userdata) {
}
int verb_is_failed(int argc, char *argv[], void *userdata) {
static const UnitActiveState states[] = {
UNIT_FAILED,
};

6
src/systemctl/systemctl-is-enabled.c
View file

@ -24,9 +24,9 @@ static int show_installation_targets_client_side(const char *name) {
if (r < 0)
return log_error_errno(r, "Failed to get file links for %s: %m", name);
for (size_t i = 0; i < n_changes; i++)
if (changes[i].type == INSTALL_CHANGE_UNLINK)
printf(" %s\n", changes[i].path);
FOREACH_ARRAY(c, changes, n_changes)
if (c->type == INSTALL_CHANGE_UNLINK)
printf(" %s\n", c->path);
return 0;
}