From: Michal Schmidt <mschmidt@redhat.com>
Date: Fri, 28 Nov 2014 12:54:40 +0000 (+0100)
Subject: core: two more log_unit_*_errno() conversions
X-Git-Tag: v218~261
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c95f97a20f3b854109dc564da64950067b388aeb;p=elogind.git

core: two more log_unit_*_errno() conversions
---

diff --git a/src/core/automount.c b/src/core/automount.c
index 3f34a2895..bc2834334 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -744,7 +744,10 @@ static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, vo
 
         l = loop_read(a->pipe_fd, &packet, sizeof(packet), true);
         if (l != sizeof(packet)) {
-                log_unit_error(UNIT(a)->id, "Invalid read from pipe: %s", l < 0 ? strerror(-l) : "short read");
+                if (l < 0)
+                        log_unit_error_errno(UNIT(a)->id, l, "Invalid read from pipe: %m");
+                else
+                        log_unit_error(UNIT(a)->id, "Invalid read from pipe: short read");
                 goto fail;
         }
 
diff --git a/src/core/busname.c b/src/core/busname.c
index 6a0aef8d1..7e7f7b384 100644
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -304,7 +304,7 @@ static int busname_open_fd(BusName *n) {
         mode = UNIT(n)->manager->running_as == SYSTEMD_SYSTEM ? "system" : "user";
         n->starter_fd = bus_kernel_open_bus_fd(mode, &path);
         if (n->starter_fd < 0) {
-                log_unit_warning(UNIT(n)->id, "Failed to open %s: %s", path ?: "kdbus", strerror(-n->starter_fd));
+                log_unit_warning_errno(UNIT(n)->id, n->starter_fd, "Failed to open %s: %m", path ?: "kdbus");
                 return n->starter_fd;
         }