]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journal: voidify fd_nonblock()
authorLennart Poettering <lennart@poettering.net>
Fri, 12 Oct 2018 16:26:02 +0000 (18:26 +0200)
committerLennart Poettering <lennart@poettering.net>
Sat, 13 Oct 2018 10:37:13 +0000 (12:37 +0200)
CID #1396098
CID #1396096
CID #1396091
CID #1396086

src/journal/journald-audit.c
src/journal/journald-native.c
src/journal/journald-stream.c
src/journal/journald-syslog.c

index 87726684af488d30cf025aae0da4e0ae74cd1e30..68d889b5fbb08051b380502c04c9bc7b1f2e90f1 100644 (file)
@@ -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)
index b2f6e11dba5eafe4aeb3d007905eb477806c289e..44610a4b3b33cba62494759a68dd36702f8920e7 100644 (file)
@@ -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)
index dbf3503a82162035c17badf006652ec513653762..267e63f4a25b1fc308a02401f830496d3febcdb8 100644 (file)
@@ -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)
index 72b73c2c0fb49457c22705a93739c5cf25b6b3b9..46cc110f1cc7d76434fd57ceb258cef16404dbba 100644 (file)
@@ -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)