X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald-stream.c;h=be498d4919d1d7192070403b59e93e59d8b60039;hb=4a62c710b62a5a3c7a8a278b810b9d5b5a0c8f4f;hp=751b2f49b529fa3c0e803b7825aea6ddcd4d0c8e;hpb=56f64d95763a799ba4475daf44d8e9f72a1bd474;p=elogind.git diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index 751b2f49b..be498d491 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -441,25 +441,19 @@ int server_open_stdout_socket(Server *s) { }; s->stdout_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0); - if (s->stdout_fd < 0) { - log_error_errno(errno, "socket() failed: %m"); - return -errno; - } + if (s->stdout_fd < 0) + return log_error_errno(errno, "socket() failed: %m"); unlink(sa.un.sun_path); r = bind(s->stdout_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path)); - if (r < 0) { - log_error_errno(errno, "bind(%s) failed: %m", sa.un.sun_path); - return -errno; - } + if (r < 0) + return log_error_errno(errno, "bind(%s) failed: %m", sa.un.sun_path); chmod(sa.un.sun_path, 0666); - if (listen(s->stdout_fd, SOMAXCONN) < 0) { - log_error_errno(errno, "listen(%s) failed: %m", sa.un.sun_path); - return -errno; - } + if (listen(s->stdout_fd, SOMAXCONN) < 0) + return log_error_errno(errno, "listen(%s) failed: %m", sa.un.sun_path); } else fd_nonblock(s->stdout_fd, 1);