From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 13 Feb 2018 22:57:40 +0000 (+0100)
Subject: ask-password: let's use structure initialization properly
X-Git-Tag: v238~100^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70dee4755a573f538e8897f97dde868bc1741170;p=thirdparty%2Fsystemd.git

ask-password: let's use structure initialization properly
---

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index 6f5a72dd469..fbe8d06c34d 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -267,11 +267,14 @@ int ask_password_tty(
                 reset_tty = true;
         }
 
-        zero(pollfd);
-        pollfd[POLL_TTY].fd = ttyfd >= 0 ? ttyfd : STDIN_FILENO;
-        pollfd[POLL_TTY].events = POLLIN;
-        pollfd[POLL_INOTIFY].fd = notify;
-        pollfd[POLL_INOTIFY].events = POLLIN;
+        pollfd[POLL_TTY] = (struct pollfd) {
+                .fd = ttyfd >= 0 ? ttyfd : STDIN_FILENO,
+                .events = POLLIN,
+        };
+        pollfd[POLL_INOTIFY] = (struct pollfd) {
+                .fd = notify,
+                .events = POLLIN,
+        };
 
         for (;;) {
                 char c;