fsckd: the error code is actually returned in 'fd'

Also, we don't use {} for single-line if-blocks.

diff --git a/src/fsckd/fsckd.c b/src/fsckd/fsckd.c
index df413fbb83cc4348a423e3268e6e9caa0fe53831..d4e9896e91cbc1bb1bf7fde7d9ffca4248ccf1a1 100644 (file)
--- a/src/fsckd/fsckd.c
+++ b/src/fsckd/fsckd.c
@@ -520,12 +520,12 @@ int main(int argc, char *argv[]) {
         if (n > 1) {
                 log_error("Too many file descriptors received.");
                 return EXIT_FAILURE;
         if (n > 1) {
                 log_error("Too many file descriptors received.");
                 return EXIT_FAILURE;

-        } else if (n == 1) {
+        } else if (n == 1)

                 fd = SD_LISTEN_FDS_START + 0;
                 fd = SD_LISTEN_FDS_START + 0;

-        } else {
+        else {

                 fd = make_socket_fd(LOG_DEBUG, FSCKD_SOCKET_PATH, SOCK_STREAM | SOCK_CLOEXEC);
                 if (fd < 0) {
                 fd = make_socket_fd(LOG_DEBUG, FSCKD_SOCKET_PATH, SOCK_STREAM | SOCK_CLOEXEC);
                 if (fd < 0) {

-                        log_error_errno(r, "Couldn't create listening socket fd on %s: %m", FSCKD_SOCKET_PATH);
+                        log_error_errno(fd, "Couldn't create listening socket fd on %s: %m", FSCKD_SOCKET_PATH);

                         return EXIT_FAILURE;
                 }
         }
                         return EXIT_FAILURE;
                 }
         }