|
 |
36e8a3 |
From 285e4d2ce6a8836ce7bf2e889d43b7272f7ccc1b Mon Sep 17 00:00:00 2001
|
|
|
36e8a3 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
36e8a3 |
Date: Wed, 5 Dec 2018 17:53:50 +0100
|
|
|
36e8a3 |
Subject: [PATCH] journald: remove unnecessary {}
|
|
|
36e8a3 |
|
|
|
36e8a3 |
(cherry-picked from commit bc2762a309132a34db1797d8b5792d5747a94484)
|
|
|
36e8a3 |
|
|
|
36e8a3 |
Related: #1664976
|
|
|
36e8a3 |
---
|
|
|
36e8a3 |
src/journal/journald-server.c | 4 +---
|
|
|
36e8a3 |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
36e8a3 |
|
|
|
36e8a3 |
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
|
|
|
36e8a3 |
index 4f1550ec5..ce2446a2f 100644
|
|
|
36e8a3 |
--- a/src/journal/journald-server.c
|
|
|
36e8a3 |
+++ b/src/journal/journald-server.c
|
|
|
36e8a3 |
@@ -1124,8 +1124,7 @@ int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void
|
|
|
36e8a3 |
return log_error_errno(errno, "recvmsg() failed: %m");
|
|
|
36e8a3 |
}
|
|
|
36e8a3 |
|
|
|
36e8a3 |
- CMSG_FOREACH(cmsg, &msghdr) {
|
|
|
36e8a3 |
-
|
|
|
36e8a3 |
+ CMSG_FOREACH(cmsg, &msghdr)
|
|
|
36e8a3 |
if (cmsg->cmsg_level == SOL_SOCKET &&
|
|
|
36e8a3 |
cmsg->cmsg_type == SCM_CREDENTIALS &&
|
|
|
36e8a3 |
cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred)))
|
|
|
36e8a3 |
@@ -1143,7 +1142,6 @@ int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void
|
|
|
36e8a3 |
fds = (int*) CMSG_DATA(cmsg);
|
|
|
36e8a3 |
n_fds = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int);
|
|
|
36e8a3 |
}
|
|
|
36e8a3 |
- }
|
|
|
36e8a3 |
|
|
|
36e8a3 |
/* And a trailing NUL, just in case */
|
|
|
36e8a3 |
s->buffer[n] = 0;
|