treewide: simplify log_*_errno(r,...) immediately followed by "return r"

[elogind.git] / src / activate / activate.c

diff --git a/src/activate/activate.c b/src/activate/activate.c
index f4f41ed36cc31870e3a74fb8fbe27d4e7b2db01e..a17babe076d9a699f02c9c9beea7512d68678f4f 100644 (file)
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -65,11 +65,8 @@ static int open_sockets(int *epoll_fd, bool accept) {
         int count = 0;
 
         n = sd_listen_fds(true);
-        if (n < 0) {
-                log_error("Failed to read listening file descriptors from environment: %s",
-                          strerror(-n));
-                return n;
-        }
+        if (n < 0)
+                return log_error_errno(n, "Failed to read listening file descriptors from environment: %m");
         if (n > 0) {
                 log_info("Received %i descriptors via the environment.", n);
 
@@ -103,7 +100,7 @@ static int open_sockets(int *epoll_fd, bool accept) {
                 fd = make_socket_fd(LOG_DEBUG, *address, SOCK_STREAM | (arg_accept*SOCK_CLOEXEC));
                 if (fd < 0) {
                         log_open();
-                        log_error_errno(-fd, "Failed to open '%s': %m", *address);
+                        log_error_errno(fd, "Failed to open '%s': %m", *address);
                         return fd;
                 }