[systemd-commits] src/core

[Michal Schmidt]

 src/core/manager.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 895b3a7b44fe7ca2f260986be2a877ff56a72718
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Fri Nov 28 19:20:59 2014 +0100

    core: fix return value in error path after sd_event_add_io() failure
    
    sd_event_add_io() does not set errno, it returns negative errno.
    
    Noticed during log_*_errno conversions.

diff --git a/src/core/manager.c b/src/core/manager.c
index 7b61728..a84272c 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -692,10 +692,8 @@ static int manager_setup_notify(Manager *m) {
 
         if (!m->notify_event_source) {
                 r = sd_event_add_io(m->event, &m->notify_event_source, m->notify_fd, EPOLLIN, manager_dispatch_notify_fd, m);
-                if (r < 0) {
-                        log_error_errno(r, "Failed to allocate notify event source: %m");
-                        return -errno;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to allocate notify event source: %m");
 
                 /* Process signals a bit earlier than SIGCHLD, so that we can
                  * still identify to which service an exit message belongs */