diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/decrypt.c | 4 | ||||
| -rw-r--r-- | g10/encrypt.c | 2 | ||||
| -rw-r--r-- | g10/openfile.c | 4 | ||||
| -rw-r--r-- | g10/plaintext.c | 4 | ||||
| -rw-r--r-- | g10/verify.c | 3 |
5 files changed, 9 insertions, 8 deletions
diff --git a/g10/decrypt.c b/g10/decrypt.c index 0c2c51617..b30359af4 100644 --- a/g10/decrypt.c +++ b/g10/decrypt.c @@ -144,7 +144,7 @@ decrypt_message_fd (ctrl_t ctrl, gnupg_fd_t input_fd, char xname[64]; err = gpg_error (GPG_ERR_EPERM); - snprintf (xname, sizeof xname, "[fd %d]", (int)(intptr_t)output_fd); + snprintf (xname, sizeof xname, "[fd %d]", FD_DBG (output_fd)); log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (err)); iobuf_close (fp); release_progress_context (pfx); @@ -157,7 +157,7 @@ decrypt_message_fd (ctrl_t ctrl, gnupg_fd_t input_fd, char xname[64]; err = gpg_error_from_syserror (); - snprintf (xname, sizeof xname, "[fd %d]", (int)(intptr_t)output_fd); + snprintf (xname, sizeof xname, "[fd %d]", FD_DBG (output_fd)); log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (err)); iobuf_close (fp); release_progress_context (pfx); diff --git a/g10/encrypt.c b/g10/encrypt.c index a5b020736..62483fa16 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -842,7 +842,7 @@ encrypt_crypt (ctrl_t ctrl, gnupg_fd_t filefd, const char *filename, rc = gpg_error_from_syserror (); if (filefd != GNUPG_INVALID_FD) - snprintf (xname, sizeof xname, "[fd %d]", (int)(intptr_t)filefd); + snprintf (xname, sizeof xname, "[fd %d]", FD_DBG (filefd)); else if (!filename) strcpy (xname, "[stdin]"); else diff --git a/g10/openfile.c b/g10/openfile.c index 80c33f094..01f323399 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -193,12 +193,12 @@ open_outfile (gnupg_fd_t out_fd, const char *iname, int mode, if (!*a) { rc = gpg_error_from_syserror (); - snprintf (xname, sizeof xname, "[fd %d]", (int)(intptr_t)out_fd); + snprintf (xname, sizeof xname, "[fd %d]", FD_DBG (out_fd)); log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (rc)); } else if (opt.verbose) { - snprintf (xname, sizeof xname, "[fd %d]", (int)(intptr_t)out_fd); + snprintf (xname, sizeof xname, "[fd %d]", FD_DBG (out_fd)); log_info (_("writing to '%s'\n"), xname); } } diff --git a/g10/plaintext.c b/g10/plaintext.c index 03ddadcec..a96214994 100644 --- a/g10/plaintext.c +++ b/g10/plaintext.c @@ -124,7 +124,7 @@ get_output_file (const byte *embedded_name, int embedded_namelen, else if (!(fp = open_stream_nc (fd, "wb"))) { err = gpg_error_from_syserror (); - snprintf (xname, sizeof xname, "[fd %d]", (int)(intptr_t)fd); + snprintf (xname, sizeof xname, "[fd %d]", FD_DBG (fd)); log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (err)); goto leave; } @@ -740,7 +740,7 @@ hash_datafile_by_fd (gcry_md_hd_t md, gcry_md_hd_t md2, { int rc = gpg_error_from_syserror (); log_error (_("can't open signed data fd=%d: %s\n"), - data_fd, strerror (errno)); + FD_DBG (data_fd), strerror (errno)); release_progress_context (pfx); return rc; } diff --git a/g10/verify.c b/g10/verify.c index 17134a281..f8abadd45 100644 --- a/g10/verify.c +++ b/g10/verify.c @@ -261,7 +261,8 @@ gpg_verify (ctrl_t ctrl, gnupg_fd_t sig_fd, gnupg_fd_t data_fd, if (!fp) { rc = gpg_error_from_syserror (); - log_error (_("can't open fd %d: %s\n"), sig_fd, strerror (errno)); + log_error (_("can't open fd %d: %s\n"), FD_DBG (sig_fd), + strerror (errno)); goto leave; } |