projects
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8c2836f
)
journald: remove unnecessary {}
author
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Wed, 5 Dec 2018 16:53:50 +0000
(17:53 +0100)
committer
Michael Biebl
<biebl@debian.org>
Sat, 12 Jan 2019 20:49:44 +0000
(20:49 +0000)
(cherry picked from commit
bc2762a309132a34db1797d8b5792d5747a94484
)
(cherry picked from commit
ccbb69e14ea9938c20ced03b4952fee0d22684b0
)
Gbp-Pq: Name journald-remove-unnecessary.patch
src/journal/journald-server.c
patch
|
blob
|
history
diff --git
a/src/journal/journald-server.c
b/src/journal/journald-server.c
index 434325c1795ea5a95c59b0ec5b0b1aa412a043bf..f09672531caa7f7ff319827eff936c008cdcea84 100644
(file)
--- a/
src/journal/journald-server.c
+++ b/
src/journal/journald-server.c
@@
-1276,8
+1276,7
@@
int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void
return log_error_errno(errno, "recvmsg() failed: %m");
}
- CMSG_FOREACH(cmsg, &msghdr) {
-
+ CMSG_FOREACH(cmsg, &msghdr)
if (cmsg->cmsg_level == SOL_SOCKET &&
cmsg->cmsg_type == SCM_CREDENTIALS &&
cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred)))
@@
-1295,7
+1294,6
@@
int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void
fds = (int*) CMSG_DATA(cmsg);
n_fds = (cmsg->cmsg_len - CMSG_LEN(0)) / sizeof(int);
}
- }
/* And a trailing NUL, just in case */
s->buffer[n] = 0;