X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimesync%2Ftimesyncd-manager.c;h=f87722ddcecd11e70e7887046ecd685ae70e217d;hp=03cfb248c0deed7776c32e8a099c8a18937ad3e1;hb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14;hpb=b4d23205f238e06aaa31264628e20669e714acad

diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index 03cfb248c..f87722ddc 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("Failed to setup connection socket: %s", strerror(-r));
+                        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("Failed to rearm timer: %s", strerror(-r));
+                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("Failed to arm timeout timer: %s", strerror(-r));
+                        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("Failed to create clock watch event source: %s", strerror(-r));
+                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("Failed to rearm timer: %s", strerror(-r));
+                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("Failed to add server address: %s", strerror(-r));
+                        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("Failed to create retry timer: %s", strerror(-r));
+                        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("Failed to create retry timer: %s", strerror(-r));
+                                        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("Failed to create resolver: %s", strerror(-r));
+                        log_error_errno(-r, "Failed to create resolver: %m");
                         return r;
                 }