diff options
Diffstat (limited to 'src/timesync')
| -rw-r--r-- | src/timesync/timesyncd-manager.c | 18 | ||||
| -rw-r--r-- | src/timesync/timesyncd.c | 8 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c index f87722ddce..8e4c0f3392 100644 --- a/src/timesync/timesyncd-manager.c +++ b/src/timesync/timesyncd-manager.c @@ -188,7 +188,7 @@ static int manager_send_request(Manager *m) { if (m->server_socket < 0) { r = manager_listen_setup(m); if (r < 0) { - log_warning_errno(-r, "Failed to setup connection socket: %m"); + log_warning_errno(r, "Failed to setup connection socket: %m"); return r; } } @@ -226,7 +226,7 @@ static int manager_send_request(Manager *m) { r = manager_arm_timer(m, m->retry_interval); if (r < 0) { - log_error_errno(-r, "Failed to rearm timer: %m"); + log_error_errno(r, "Failed to rearm timer: %m"); return r; } @@ -239,7 +239,7 @@ static int manager_send_request(Manager *m) { now(clock_boottime_or_monotonic()) + TIMEOUT_USEC, 0, manager_timeout, m); if (r < 0) { - log_error_errno(-r, "Failed to arm timeout timer: %m"); + log_error_errno(r, "Failed to arm timeout timer: %m"); return r; } } @@ -329,7 +329,7 @@ static int manager_clock_watch_setup(Manager *m) { r = sd_event_add_io(m->event, &m->event_clock_watch, m->clock_watch_fd, EPOLLIN, manager_clock_watch, m); if (r < 0) { - log_error_errno(-r, "Failed to create clock watch event source: %m"); + log_error_errno(r, "Failed to create clock watch event source: %m"); return r; } @@ -699,7 +699,7 @@ static int manager_receive_response(sd_event_source *source, int fd, uint32_t re r = manager_arm_timer(m, m->poll_interval_usec); if (r < 0) { - log_error_errno(-r, "Failed to rearm timer: %m"); + log_error_errno(r, "Failed to rearm timer: %m"); return r; } @@ -827,7 +827,7 @@ static int manager_resolve_handler(sd_resolve_query *q, int ret, const struct ad r = server_address_new(m->current_server_name, &a, (const union sockaddr_union*) ai->ai_addr, ai->ai_addrlen); if (r < 0) { - log_error_errno(-r, "Failed to add server address: %m"); + log_error_errno(r, "Failed to add server address: %m"); return r; } @@ -868,7 +868,7 @@ int manager_connect(Manager *m) { r = sd_event_add_time(m->event, &m->event_retry, clock_boottime_or_monotonic(), now(clock_boottime_or_monotonic()) + RETRY_USEC, 0, manager_retry_connect, m); if (r < 0) { - log_error_errno(-r, "Failed to create retry timer: %m"); + log_error_errno(r, "Failed to create retry timer: %m"); return r; } @@ -924,7 +924,7 @@ int manager_connect(Manager *m) { log_debug("Waiting after exhausting servers."); r = sd_event_add_time(m->event, &m->event_retry, clock_boottime_or_monotonic(), now(clock_boottime_or_monotonic()) + m->poll_interval_usec, 0, manager_retry_connect, m); if (r < 0) { - log_error_errno(-r, "Failed to create retry timer: %m"); + log_error_errno(r, "Failed to create retry timer: %m"); return r; } @@ -953,7 +953,7 @@ int manager_connect(Manager *m) { r = sd_resolve_getaddrinfo(m->resolve, &m->resolve_query, m->current_server_name->string, "123", &hints, manager_resolve_handler, m); if (r < 0) { - log_error_errno(-r, "Failed to create resolver: %m"); + log_error_errno(r, "Failed to create resolver: %m"); return r; } diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c index b5a521f672..ed02e6db3a 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c @@ -101,7 +101,7 @@ int main(int argc, char *argv[]) { r = get_user_creds(&user, &uid, &gid, NULL, NULL); if (r < 0) { - log_error_errno(-r, "Cannot resolve user name %s: %m", user); + log_error_errno(r, "Cannot resolve user name %s: %m", user); goto finish; } @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) { r = manager_new(&m); if (r < 0) { - log_error_errno(-r, "Failed to allocate manager: %m"); + log_error_errno(r, "Failed to allocate manager: %m"); goto finish; } @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) { r = manager_parse_config_file(m); if (r < 0) - log_warning_errno(-r, "Failed to parse configuration file: %m"); + log_warning_errno(r, "Failed to parse configuration file: %m"); log_debug("systemd-timesyncd running as pid %lu", (unsigned long) getpid()); sd_notify(false, @@ -144,7 +144,7 @@ int main(int argc, char *argv[]) { r = sd_event_loop(m->event); if (r < 0) { - log_error_errno(-r, "Failed to run event loop: %m"); + log_error_errno(r, "Failed to run event loop: %m"); goto finish; } |