From c95f97a20f3b854109dc564da64950067b388aeb Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 28 Nov 2014 13:54:40 +0100 Subject: core: two more log_unit_*_errno() conversions --- src/core/automount.c | 5 ++++- src/core/busname.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/core/automount.c b/src/core/automount.c index 3f34a2895f..bc2834334e 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 6a0aef8d1f..7e7f7b384c 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; } -- cgit v1.2.3-54-g00ecf