diff options
| author | NIIBE Yutaka <[email protected]> | 2023-07-18 05:43:36 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2023-07-18 05:43:36 +0000 |
| commit | ea1935252e287b63f04c6d460cfb85e4e5efe379 (patch) | |
| tree | 926cd14224f7058027cebe985f354868f66f8969 /agent/gpg-agent.c | |
| parent | common,w32: Fix FD2INT macro. (diff) | |
| download | gnupg-ea1935252e287b63f04c6d460cfb85e4e5efe379.tar.gz gnupg-ea1935252e287b63f04c6d460cfb85e4e5efe379.zip | |
commond: Introduce FD2NUM to express conversion to number of fds.
* common/sysutils.h (FD2NUM): New.
* agent/call-pinentry.c (watch_sock): Use FD2NUM.
* agent/gpg-agent.c (handle_connections): Likewise.
* dirmngr/dirmngr.c (handle_connections): Likewise.
* dirmngr/http.c (connect_with_timeout): Likewise.
* kbx/keyboxd.c (handle_connections): Likewise.
* scd/scdaemon.c (handle_connections): Likewise.
* tpm2d/tpm2daemon.c (handle_connections): Likewise.
--
GnuPG-bug-id: 6598
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'agent/gpg-agent.c')
| -rw-r--r-- | agent/gpg-agent.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index de33d0b4e..335d389c6 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -3070,24 +3070,24 @@ handle_connections (gnupg_fd_t listen_fd, FD_ZERO (&fdset); FD_SET (FD2INT (listen_fd), &fdset); - nfd = FD2INT (listen_fd); + nfd = FD2NUM (listen_fd); if (listen_fd_extra != GNUPG_INVALID_FD) { FD_SET ( FD2INT(listen_fd_extra), &fdset); if (FD2INT (listen_fd_extra) > nfd) - nfd = FD2INT (listen_fd_extra); + nfd = FD2NUM (listen_fd_extra); } if (listen_fd_browser != GNUPG_INVALID_FD) { FD_SET ( FD2INT(listen_fd_browser), &fdset); if (FD2INT (listen_fd_browser) > nfd) - nfd = FD2INT (listen_fd_browser); + nfd = FD2NUM (listen_fd_browser); } if (listen_fd_ssh != GNUPG_INVALID_FD) { FD_SET ( FD2INT(listen_fd_ssh), &fdset); if (FD2INT (listen_fd_ssh) > nfd) - nfd = FD2INT (listen_fd_ssh); + nfd = FD2NUM (listen_fd_ssh); } if (sock_inotify_fd != -1) { |