aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2023-07-05 04:11:16 +0000
committerNIIBE Yutaka <[email protected]>2023-07-05 04:11:16 +0000
commit577baf4af3009071ff9f4909f1f40a74ab735d68 (patch)
tree9b6977fd3e3de5dcc8619dfa1ff642619137e1ae
parentgpg: Use gnupg_fd_t for decryption and sign. (diff)
downloadgnupg-577baf4af3009071ff9f4909f1f40a74ab735d68.tar.gz
gnupg-577baf4af3009071ff9f4909f1f40a74ab735d68.zip
gpg: Format the value of type gnupg_fd_t by casting to int.
* g10/openfile.c (open_outfile): Cast to int. * g10/encrypt.c (encrypt_crypt): Ditto. * g10/decrypt.c (decrypt_message_fd): Ditto. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r--g10/decrypt.c2
-rw-r--r--g10/encrypt.c2
-rw-r--r--g10/openfile.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/g10/decrypt.c b/g10/decrypt.c
index 26081ed1b..e000ac478 100644
--- a/g10/decrypt.c
+++ b/g10/decrypt.c
@@ -153,7 +153,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)(intprt_t)output_fd);
+ snprintf (xname, sizeof xname, "[fd %d]", (int)(intptr_t)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 42ee0b773..a5b020736 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]", filefd);
+ snprintf (xname, sizeof xname, "[fd %d]", (int)(intptr_t)filefd);
else if (!filename)
strcpy (xname, "[stdin]");
else
diff --git a/g10/openfile.c b/g10/openfile.c
index 810811c64..80c33f094 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]", out_fd);
+ snprintf (xname, sizeof xname, "[fd %d]", (int)(intptr_t)out_fd);
log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (rc));
}
else if (opt.verbose)
{
- snprintf (xname, sizeof xname, "[fd %d]", out_fd);
+ snprintf (xname, sizeof xname, "[fd %d]", (int)(intptr_t)out_fd);
log_info (_("writing to '%s'\n"), xname);
}
}