picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tty-ask-password: fix dead code path

Browse source 
Coverity was complaining that watch==1 always at this point.
CID #1405882.

Use structured initialization while at it.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-10-21 20:52:18 +02:00
parent ce2f43797a
commit 7d895205ef
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/tty-ask-password-agent/tty-ask-password-agent.c
View file

@ -337,7 +337,7 @@ static int process_and_watch_password_files(bool watch) {
};
_cleanup_close_ int notify = -1, signal_fd = -1, tty_block_fd = -1;
struct pollfd pollfd[_FD_MAX] = {};
struct pollfd pollfd[_FD_MAX];
sigset_t mask;
int r;
@ -354,8 +354,7 @@ static int process_and_watch_password_files(bool watch) {
if (signal_fd < 0)
return log_error_errno(errno, "Failed to allocate signal file descriptor: %m");
pollfd[FD_SIGNAL].fd = signal_fd;
pollfd[FD_SIGNAL].events = POLLIN;
pollfd[FD_SIGNAL] = (struct pollfd) { .fd = signal_fd, .events = POLLIN };
notify = inotify_init1(IN_CLOEXEC);
if (notify < 0)
@ -365,8 +364,7 @@ static int process_and_watch_password_files(bool watch) {
if (r < 0)
return r;
pollfd[FD_INOTIFY].fd = notify;
pollfd[FD_INOTIFY].events = POLLIN;
pollfd[FD_INOTIFY] = (struct pollfd) { .fd = notify, .events = POLLIN };
}
for (;;) {
@ -389,7 +387,7 @@ static int process_and_watch_password_files(bool watch) {
if (!watch)
break;
if (poll(pollfd, watch ? _FD_MAX : _FD_MAX-1, timeout) < 0) {
if (poll(pollfd, _FD_MAX, timeout) < 0) {
if (errno == EINTR)
continue;