diff options
author | David Tardon <dtardon@redhat.com> | 2024-05-07 13:29:30 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2024-05-07 14:02:08 +0200 |
commit | af1690cfccceb7e7553f6f842a201be4ebcbbd27 (patch) | |
tree | 780535b51f67b5c7d8e40429e1156b2c23c9e031 /src/core/manager.c | |
parent | resolved-dns-stream: pass the right error variable (diff) | |
download | systemd-af1690cfccceb7e7553f6f842a201be4ebcbbd27.tar.xz systemd-af1690cfccceb7e7553f6f842a201be4ebcbbd27.zip |
manager: pass the right error variable
Diffstat (limited to '')
-rw-r--r-- | src/core/manager.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 07d5d8cfaa..4c9ef44a4a 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1242,13 +1242,13 @@ static int manager_setup_user_lookup_fd(Manager *m) { if (!m->user_lookup_event_source) { r = sd_event_add_io(m->event, &m->user_lookup_event_source, m->user_lookup_fds[0], EPOLLIN, manager_dispatch_user_lookup_fd, m); if (r < 0) - return log_error_errno(errno, "Failed to allocate user lookup event source: %m"); + return log_error_errno(r, "Failed to allocate user lookup event source: %m"); /* Process even earlier than the notify event source, so that we always know first about valid UID/GID * resolutions */ r = sd_event_source_set_priority(m->user_lookup_event_source, EVENT_PRIORITY_USER_LOOKUP); if (r < 0) - return log_error_errno(errno, "Failed to set priority of user lookup event source: %m"); + return log_error_errno(r, "Failed to set priority of user lookup event source: %m"); (void) sd_event_source_set_description(m->user_lookup_event_source, "user-lookup"); } @@ -1287,11 +1287,11 @@ static int manager_setup_handoff_timestamp_fd(Manager *m) { if (!m->handoff_timestamp_event_source) { r = sd_event_add_io(m->event, &m->handoff_timestamp_event_source, m->handoff_timestamp_fds[0], EPOLLIN, manager_dispatch_handoff_timestamp_fd, m); if (r < 0) - return log_error_errno(errno, "Failed to allocate handoff timestamp event source: %m"); + return log_error_errno(r, "Failed to allocate handoff timestamp event source: %m"); r = sd_event_source_set_priority(m->handoff_timestamp_event_source, EVENT_PRIORITY_HANDOFF_TIMESTAMP); if (r < 0) - return log_error_errno(errno, "Failed to set priority of handoff timestamp event source: %m"); + return log_error_errno(r, "Failed to set priority of handoff timestamp event source: %m"); (void) sd_event_source_set_description(m->handoff_timestamp_event_source, "handoff-timestamp"); } @@ -3069,7 +3069,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t r = manager_get_dump_string(m, /* patterns= */ NULL, &dump); if (r < 0) { - log_warning_errno(errno, "Failed to acquire manager dump: %m"); + log_warning_errno(r, "Failed to acquire manager dump: %m"); break; } @@ -3160,7 +3160,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t r = manager_get_dump_jobs_string(m, /* patterns= */ NULL, " ", &dump_jobs); if (r < 0) { - log_warning_errno(errno, "Failed to acquire manager jobs dump: %m"); + log_warning_errno(r, "Failed to acquire manager jobs dump: %m"); break; } |