X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Factivate%2Factivate.c;h=a17babe076d9a699f02c9c9beea7512d68678f4f;hp=f4f41ed36cc31870e3a74fb8fbe27d4e7b2db01e;hb=eb56eb9b40950f1edcffdb7313f8de4f8572a6d5;hpb=0a1beeb64207eaa88ab9236787b1cbc2f704ae14 diff --git a/src/activate/activate.c b/src/activate/activate.c index f4f41ed36..a17babe07 100644 --- 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; }