X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fpath.c;h=3624bfcac7f771365e0a113786d3c6f540b1ae88;hb=dc8962da74c62779d8899a8166f704c30287fff0;hp=ca586d961681e5bf567105bb5c099984738136fd;hpb=da927ba997d68401563b927f92e6e40e021a8e5c;p=elogind.git diff --git a/src/core/path.c b/src/core/path.c index ca586d961..3624bfcac 100644 --- a/src/core/path.c +++ b/src/core/path.c @@ -136,7 +136,7 @@ int path_spec_watch(PathSpec *s, sd_event_io_handler_t handler) { } if (!exists) { - log_error("Failed to add watch on any of the components of %s: %m", + log_error_errno(errno, "Failed to add watch on any of the components of %s: %m", s->path); r = -errno; /* either EACCESS or ENOENT */ goto fail; @@ -168,10 +168,8 @@ int path_spec_fd_event(PathSpec *s, uint32_t revents) { return -EINVAL; } - if (ioctl(s->inotify_fd, FIONREAD, &l) < 0) { - log_error("FIONREAD failed: %m"); - return -errno; - } + if (ioctl(s->inotify_fd, FIONREAD, &l) < 0) + return log_error_errno(errno, "FIONREAD failed: %m"); assert(l > 0); @@ -180,10 +178,8 @@ int path_spec_fd_event(PathSpec *s, uint32_t revents) { return log_oom(); k = read(s->inotify_fd, buf, l); - if (k < 0) { - log_error("Failed to read inotify event: %m"); - return -errno; - } + if (k < 0) + return log_error_errno(errno, "Failed to read inotify event: %m"); e = (struct inotify_event*) buf; @@ -562,8 +558,7 @@ static void path_enter_waiting(Path *p, bool initial, bool recheck) { return; fail: - log_warning("%s failed to enter waiting state: %s", - UNIT(p)->id, strerror(-r)); + log_warning_errno(r, "%s failed to enter waiting state: %m", UNIT(p)->id); path_enter_dead(p, PATH_FAILURE_RESOURCES); }