diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-08-07 10:14:30 +0900 |
---|---|---|
committer | Lukáš Nykrýn <lnykryn@redhat.com> | 2019-05-02 10:50:21 +0200 |
commit | 9bf05059882a8bc80d33877a315e2bd66fe9e1b5 (patch) | |
tree | 85a7c3d42c5648eabe580f92b6ff1652ca9aa46c /src/login | |
parent | 9d0046ceca10911361137d6496987cb15ffff132 (diff) | |
download | systemd-9bf05059882a8bc80d33877a315e2bd66fe9e1b5.tar.gz |
tree-wide: shorten error logging a bit
Continuation of 4027f96aa08c73f109aa46b89842ca0e25c9c0e9.
(cherry picked from commit 4ae25393f37b96b2b753562a349d68947ab1ad3d)
Resolves: #1697893
Diffstat (limited to 'src/login')
-rw-r--r-- | src/login/loginctl.c | 75 | ||||
-rw-r--r-- | src/login/logind-action.c | 6 | ||||
-rw-r--r-- | src/login/logind-core.c | 4 |
3 files changed, 31 insertions, 54 deletions
diff --git a/src/login/loginctl.c b/src/login/loginctl.c index be55fdbfd8..9b3fed928b 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -856,10 +856,9 @@ static int show_session(int argc, char *argv[], void *userdata) { session = getenv("XDG_SESSION_ID"); if (session) { r = get_session_path(bus, session, &error, &path); - if (r < 0) { - log_error("Failed to get session path: %s", bus_error_message(&error, r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to get session path: %s", bus_error_message(&error, r)); + p = path; } @@ -868,10 +867,8 @@ static int show_session(int argc, char *argv[], void *userdata) { for (i = 1; i < argc; i++) { r = get_session_path(bus, argv[i], &error, &path); - if (r < 0) { - log_error("Failed to get session path: %s", bus_error_message(&error, r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to get session path: %s", bus_error_message(&error, r)); if (properties) r = show_properties(bus, path, &new_line); @@ -924,10 +921,8 @@ static int show_user(int argc, char *argv[], void *userdata) { "GetUser", &error, &reply, "u", (uint32_t) uid); - if (r < 0) { - log_error("Failed to get user: %s", bus_error_message(&error, r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to get user: %s", bus_error_message(&error, r)); r = sd_bus_message_read(reply, "o", &path); if (r < 0) @@ -979,10 +974,8 @@ static int show_seat(int argc, char *argv[], void *userdata) { "GetSeat", &error, &reply, "s", argv[i]); - if (r < 0) { - log_error("Failed to get seat: %s", bus_error_message(&error, r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to get seat: %s", bus_error_message(&error, r)); r = sd_bus_message_read(reply, "o", &path); if (r < 0) @@ -1036,10 +1029,8 @@ static int activate(int argc, char *argv[], void *userdata) { "ActivateSession", &error, NULL, "s", argv[i]); - if (r < 0) { - log_error("Failed to issue method call: %s", bus_error_message(&error, -r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to issue method call: %s", bus_error_message(&error, -r)); } return 0; @@ -1068,10 +1059,8 @@ static int kill_session(int argc, char *argv[], void *userdata) { "KillSession", &error, NULL, "ssi", argv[i], arg_kill_who, arg_signal); - if (r < 0) { - log_error("Could not kill session: %s", bus_error_message(&error, -r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not kill session: %s", bus_error_message(&error, -r)); } return 0; @@ -1121,10 +1110,8 @@ static int enable_linger(int argc, char *argv[], void *userdata) { "SetUserLinger", &error, NULL, "ubb", (uint32_t) uid, b, true); - if (r < 0) { - log_error("Could not enable linger: %s", bus_error_message(&error, -r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not enable linger: %s", bus_error_message(&error, -r)); } return 0; @@ -1155,10 +1142,8 @@ static int terminate_user(int argc, char *argv[], void *userdata) { "TerminateUser", &error, NULL, "u", (uint32_t) uid); - if (r < 0) { - log_error("Could not terminate user: %s", bus_error_message(&error, -r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not terminate user: %s", bus_error_message(&error, -r)); } return 0; @@ -1192,10 +1177,8 @@ static int kill_user(int argc, char *argv[], void *userdata) { "KillUser", &error, NULL, "ui", (uint32_t) uid, arg_signal); - if (r < 0) { - log_error("Could not kill user: %s", bus_error_message(&error, -r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not kill user: %s", bus_error_message(&error, -r)); } return 0; @@ -1222,10 +1205,8 @@ static int attach(int argc, char *argv[], void *userdata) { &error, NULL, "ssb", argv[1], argv[i], true); - if (r < 0) { - log_error("Could not attach device: %s", bus_error_message(&error, -r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not attach device: %s", bus_error_message(&error, -r)); } return 0; @@ -1250,9 +1231,9 @@ static int flush_devices(int argc, char *argv[], void *userdata) { &error, NULL, "b", true); if (r < 0) - log_error("Could not flush devices: %s", bus_error_message(&error, -r)); + return log_error_errno(r, "Could not flush devices: %s", bus_error_message(&error, -r)); - return r; + return 0; } static int lock_sessions(int argc, char *argv[], void *userdata) { @@ -1274,9 +1255,9 @@ static int lock_sessions(int argc, char *argv[], void *userdata) { &error, NULL, NULL); if (r < 0) - log_error("Could not lock sessions: %s", bus_error_message(&error, -r)); + return log_error_errno(r, "Could not lock sessions: %s", bus_error_message(&error, -r)); - return r; + return 0; } static int terminate_seat(int argc, char *argv[], void *userdata) { @@ -1299,10 +1280,8 @@ static int terminate_seat(int argc, char *argv[], void *userdata) { "TerminateSeat", &error, NULL, "s", argv[i]); - if (r < 0) { - log_error("Could not terminate seat: %s", bus_error_message(&error, -r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Could not terminate seat: %s", bus_error_message(&error, -r)); } return 0; diff --git a/src/login/logind-action.c b/src/login/logind-action.c index 08e41af81a..317e9ef384 100644 --- a/src/login/logind-action.c +++ b/src/login/logind-action.c @@ -152,10 +152,8 @@ int manager_handle_action( log_info("%s", message_table[handle]); r = bus_manager_shutdown_or_sleep_now_or_later(m, target, inhibit_operation, &error); - if (r < 0) { - log_error("Failed to execute operation: %s", bus_error_message(&error, r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to execute operation: %s", bus_error_message(&error, r)); return 1; } diff --git a/src/login/logind-core.c b/src/login/logind-core.c index 511e3acf8f..cff5536ac0 100644 --- a/src/login/logind-core.c +++ b/src/login/logind-core.c @@ -522,9 +522,9 @@ int manager_spawn_autovt(Manager *m, unsigned int vtnr) { NULL, "ss", name, "fail"); if (r < 0) - log_error("Failed to start %s: %s", name, bus_error_message(&error, r)); + return log_error_errno(r, "Failed to start %s: %s", name, bus_error_message(&error, r)); - return r; + return 0; } static bool manager_is_docked(Manager *m) { |