diff options
author | Lennart Poettering <lennart@poettering.net> | 2020-04-17 15:30:48 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-04-24 07:44:42 +0200 |
commit | 41ab8c67ebfbbdc78cda473d81d392da912c17bc (patch) | |
tree | 17a5c1e1a37023f1c0b7b5d49c33d0e4989a9123 /src/shared | |
parent | 2efa5bc6fac6ab935941757993ca187de8d503fc (diff) | |
download | systemd-41ab8c67ebfbbdc78cda473d81d392da912c17bc.tar.gz |
tree-wide: use structured initialization at various places
Diffstat (limited to 'src/shared')
-rw-r--r-- | src/shared/ask-password-api.c | 12 | ||||
-rw-r--r-- | src/shared/socket-netlink.c | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index b7b7426058..4cec59087f 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -860,7 +860,6 @@ int ask_password_agent( for (;;) { char passphrase[LINE_MAX+1]; - struct msghdr msghdr; struct iovec iovec; struct ucred *ucred; union { @@ -919,11 +918,12 @@ int ask_password_agent( iovec = IOVEC_MAKE(passphrase, sizeof(passphrase)); zero(control); - zero(msghdr); - msghdr.msg_iov = &iovec; - msghdr.msg_iovlen = 1; - msghdr.msg_control = &control; - msghdr.msg_controllen = sizeof(control); + struct msghdr msghdr = { + .msg_iov = &iovec, + .msg_iovlen = 1, + .msg_control = &control, + .msg_controllen = sizeof(control), + }; n = recvmsg_safe(socket_fd, &msghdr, 0); if (IN_SET(n, -EAGAIN, -EINTR)) diff --git a/src/shared/socket-netlink.c b/src/shared/socket-netlink.c index 5177137b99..ba33825340 100644 --- a/src/shared/socket-netlink.c +++ b/src/shared/socket-netlink.c @@ -243,8 +243,9 @@ int socket_address_parse_netlink(SocketAddress *a, const char *s) { assert(a); assert(s); - zero(*a); - a->type = SOCK_RAW; + *a = (SocketAddress) { + .type = SOCK_RAW, + }; r = extract_first_word(&s, &word, NULL, 0); if (r < 0) |