From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 12 Oct 2018 16:26:02 +0000 (+0200)
Subject: journal: voidify fd_nonblock()
X-Git-Tag: v240~556^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48440643f7a994ad8620daaafed4d914f723440d;p=thirdparty%2Fsystemd.git

journal: voidify fd_nonblock()

CID #1396098
CID #1396096
CID #1396091
CID #1396086
---

diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
index 87726684af4..68d889b5fbb 100644
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -526,7 +526,7 @@ int server_open_audit(Server *s) {
                         return 0;
                 }
         } else
-                fd_nonblock(s->audit_fd, 1);
+                (void) fd_nonblock(s->audit_fd, true);
 
         r = setsockopt(s->audit_fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one));
         if (r < 0)
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index b2f6e11dba5..44610a4b3b3 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -461,7 +461,7 @@ int server_open_native_socket(Server*s) {
 
                 (void) chmod(sa.un.sun_path, 0666);
         } else
-                fd_nonblock(s->native_fd, 1);
+                (void) fd_nonblock(s->native_fd, true);
 
         r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one));
         if (r < 0)
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index dbf3503a821..267e63f4a25 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -804,7 +804,7 @@ int server_open_stdout_socket(Server *s) {
                 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);
+                (void) fd_nonblock(s->stdout_fd, true);
 
         r = sd_event_add_io(s->event, &s->stdout_event_source, s->stdout_fd, EPOLLIN, stdout_stream_new, s);
         if (r < 0)
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 72b73c2c0fb..46cc110f1cc 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -465,7 +465,7 @@ int server_open_syslog_socket(Server *s) {
 
                 (void) chmod(sa.un.sun_path, 0666);
         } else
-                fd_nonblock(s->syslog_fd, 1);
+                (void) fd_nonblock(s->syslog_fd, true);
 
         r = setsockopt(s->syslog_fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one));
         if (r < 0)