mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
common: Introduce FD_DBG to display gnupg_fd_t value.
* common/sysutils.h (FD_DBG): New. * agent/gpg-agent.c (check_nonce): Use FD_DBG. (do_start_connection_thread, start_connection_thread_ssh): Likewise. * common/iobuf.c (fd_cache_close, file_filter, do_open): Likewise. (do_iobuf_fdopen): Likewise. * dirmngr/dirmngr.c (check_nonce, start_connection_thread) (handle_connections): Likewise. * dirmngr/http.c (_my_socket_new, _my_socket_ref): Likewise. (_my_socket_unref): Likewise. * g10/decrypt.c (decrypt_message_fd): Likewise. * g10/encrypt.c (encrypt_crypt): Likewise. * g10/openfile.c (open_outfile): Likewise. * g10/plaintext.c (get_output_file, hash_datafile_by_fd): Likewise. * g10/verify.c (gpg_verify): Likewise. * kbx/keyboxd.c (check_nonce, do_start_connection_thread): Likewise. * scd/scdaemon.c (start_connection_thread): Likewise. (handle_connections): Likewise. * sm/gpgsm.c (open_es_fread, open_es_fwrite): Likewise. * tpm2d/tpm2daemon.c (start_connection_thread): Likewise. (handle_connections): Likewise. -- GnuPG-bug-id: 6597 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
ee9e3578ce
commit
b849c930e9
14 changed files with 41 additions and 37 deletions
|
@ -2232,7 +2232,7 @@ check_nonce (assuan_fd_t fd, assuan_sock_nonce_t *nonce)
|
|||
if (assuan_sock_check_nonce (fd, nonce))
|
||||
{
|
||||
log_info (_("error reading nonce on fd %d: %s\n"),
|
||||
FD2INT (fd), strerror (errno));
|
||||
FD_DBG (fd), strerror (errno));
|
||||
assuan_sock_close (fd);
|
||||
return -1;
|
||||
}
|
||||
|
@ -2266,7 +2266,7 @@ start_connection_thread (void *arg)
|
|||
|
||||
active_connections++;
|
||||
if (opt.verbose)
|
||||
log_info (_("handler for fd %d started\n"), FD2INT (fd));
|
||||
log_info (_("handler for fd %d started\n"), FD_DBG (fd));
|
||||
|
||||
session_id = ++last_session_id;
|
||||
if (!session_id)
|
||||
|
@ -2274,7 +2274,7 @@ start_connection_thread (void *arg)
|
|||
start_command_handler (fd, session_id);
|
||||
|
||||
if (opt.verbose)
|
||||
log_info (_("handler for fd %d terminated\n"), FD2INT (fd));
|
||||
log_info (_("handler for fd %d terminated\n"), FD_DBG (fd));
|
||||
active_connections--;
|
||||
|
||||
workqueue_run_post_session_tasks (session_id);
|
||||
|
@ -2493,7 +2493,7 @@ handle_connections (assuan_fd_t listen_fd)
|
|||
memset (&argval, 0, sizeof argval);
|
||||
argval.afd = fd;
|
||||
snprintf (threadname, sizeof threadname,
|
||||
"conn fd=%d", FD2INT(fd));
|
||||
"conn fd=%d", FD_DBG (fd));
|
||||
|
||||
ret = npth_create (&thread, &tattr,
|
||||
start_connection_thread, argval.aptr);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue