From 76ef789d264f9eb7d7624b994aa6eead1dacfac4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 8 Sep 2015 19:30:45 +0200 Subject: tree-wide: make use of log_error_errno() return value Turns this: r = -errno; log_error_errno(errno, "foo"); into this: r = log_error_errno(errno, "foo"); and this: r = log_error_errno(errno, "foo"); return r; into this: return log_error_errno(errno, "foo"); --- src/udev/udev-ctrl.c | 8 ++------ src/udev/udev-event.c | 6 ++---- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'src/udev') diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c index ead7c92b27..12bc6029b3 100644 --- a/src/udev/udev-ctrl.c +++ b/src/udev/udev-ctrl.c @@ -122,16 +122,12 @@ int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl) { } if (err < 0) { - err = -errno; - log_error_errno(errno, "bind failed: %m"); - return err; + return log_error_errno(errno, "bind failed: %m"); } err = listen(uctrl->sock, 0); if (err < 0) { - err = -errno; - log_error_errno(errno, "listen failed: %m"); - return err; + return log_error_errno(errno, "listen failed: %m"); } uctrl->bound = true; diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index 8ba6aed00e..1e34cbc2f5 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -731,15 +731,13 @@ int udev_event_spawn(struct udev_event *event, /* pipes from child to parent */ if (result != NULL || log_get_max_level() >= LOG_INFO) { if (pipe2(outpipe, O_NONBLOCK) != 0) { - err = -errno; - log_error_errno(errno, "pipe failed: %m"); + err = log_error_errno(errno, "pipe failed: %m"); goto out; } } if (log_get_max_level() >= LOG_INFO) { if (pipe2(errpipe, O_NONBLOCK) != 0) { - err = -errno; - log_error_errno(errno, "pipe failed: %m"); + err = log_error_errno(errno, "pipe failed: %m"); goto out; } } -- cgit v1.2.3-54-g00ecf