dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

udevadm-control: return early if --exit is used

Browse Source 
All the following commands would just fail with -ENOANO anyway, hence
there's no point in sending them. And it allows us to shave off some
error handling code.
This commit is contained in:
David Tardon
2023-11-03 14:01:54 +01:00
parent e4080a6d97
commit 3bce9d56fd
1 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/udev/udevadm-control.c
View File

@@ -184,65 +184,50 @@ int control_main(int argc, char *argv[], void *userdata) {
if (arg_exit) {
r = udev_ctrl_send_exit(uctrl);
if (r == -ENOANO)
log_warning("Cannot specify --exit after --exit, ignoring.");
else if (r < 0)
return log_error_errno(r, "Failed to send exit request: %m");
if (r < 0)
return log_error_errno(r, "Failed to send exit request: %m");
return 0;
}
if (arg_log_level >= 0) {
r = udev_ctrl_send_set_log_level(uctrl, r);
if (r == -ENOANO)
log_warning("Cannot specify --log-level after --exit, ignoring.");
else if (r < 0)
if (r < 0)
return log_error_errno(r, "Failed to send request to set log level: %m");
}
if (arg_start_exec_queue == false) {
r = udev_ctrl_send_stop_exec_queue(uctrl);
if (r == -ENOANO)
log_warning("Cannot specify --stop-exec-queue after --exit, ignoring.");
else if (r < 0)
if (r < 0)
return log_error_errno(r, "Failed to send request to stop exec queue: %m");
}
if (arg_start_exec_queue == true) {
r = udev_ctrl_send_start_exec_queue(uctrl);
if (r == -ENOANO)
log_warning("Cannot specify --start-exec-queue after --exit, ignoring.");
else if (r < 0)
if (r < 0)
return log_error_errno(r, "Failed to send request to start exec queue: %m");
}
if (arg_reload) {
r = udev_ctrl_send_reload(uctrl);
if (r == -ENOANO)
log_warning("Cannot specify --reload after --exit, ignoring.");
else if (r < 0)
if (r < 0)
return log_error_errno(r, "Failed to send reload request: %m");
}
STRV_FOREACH(env, arg_env) {
r = udev_ctrl_send_set_env(uctrl, *env);
if (r == -ENOANO)
log_warning("Cannot specify --property after --exit, ignoring.");
else if (r < 0)
if (r < 0)
return log_error_errno(r, "Failed to send request to update environment: %m");
}
if (arg_max_children) {
r = udev_ctrl_send_set_children_max(uctrl, arg_max_children);
if (r == -ENOANO)
log_warning("Cannot specify --children-max after --exit, ignoring.");
else if (r < 0)
if (r < 0)
return log_error_errno(r, "Failed to send request to set number of children: %m");
}
if (arg_ping) {
r = udev_ctrl_send_ping(uctrl);
if (r == -ENOANO)
log_error("Cannot specify --ping after --exit, ignoring.");
else if (r < 0)
if (r < 0)
return log_error_errno(r, "Failed to send a ping message: %m");
}