tree-wide: use structured initialization at various places

This commit is contained in:
Lennart Poettering
2020-04-24 07:44:42 +02:00
committed by Zbigniew Jędrzejewski-Szmek
parent 2efa5bc6fa
commit 41ab8c67eb
8 changed files with 64 additions and 57 deletions
+8 -6
View File
@@ -246,9 +246,10 @@ static int server_init(Server *s, unsigned n_sockets) {
assert(s);
assert(n_sockets > 0);
zero(*s);
*s = (struct Server) {
.epoll_fd = epoll_create1(EPOLL_CLOEXEC),
};
s->epoll_fd = epoll_create1(EPOLL_CLOEXEC);
if (s->epoll_fd < 0) {
r = log_error_errno(errno,
"Failed to create epoll object: %m");
@@ -256,7 +257,6 @@ static int server_init(Server *s, unsigned n_sockets) {
}
for (i = 0; i < n_sockets; i++) {
struct epoll_event ev;
Fifo *f;
int fd;
@@ -283,9 +283,11 @@ static int server_init(Server *s, unsigned n_sockets) {
f->fd = -1;
zero(ev);
ev.events = EPOLLIN;
ev.data.ptr = f;
struct epoll_event ev = {
.events = EPOLLIN,
.data.ptr = f,
};
if (epoll_ctl(s->epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0) {
r = -errno;
fifo_free(f);