1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-16 00:29:50 +02:00

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 <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-07-05 13:11:16 +09:00
parent 3fb69641e8
commit 577baf4af3
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
3 changed files with 4 additions and 4 deletions

View File

@ -153,7 +153,7 @@ decrypt_message_fd (ctrl_t ctrl, gnupg_fd_t input_fd,
char xname[64]; char xname[64];
err = gpg_error_from_syserror (); 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)); log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (err));
iobuf_close (fp); iobuf_close (fp);
release_progress_context (pfx); release_progress_context (pfx);

View File

@ -842,7 +842,7 @@ encrypt_crypt (ctrl_t ctrl, gnupg_fd_t filefd, const char *filename,
rc = gpg_error_from_syserror (); rc = gpg_error_from_syserror ();
if (filefd != GNUPG_INVALID_FD) 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) else if (!filename)
strcpy (xname, "[stdin]"); strcpy (xname, "[stdin]");
else else

View File

@ -193,12 +193,12 @@ open_outfile (gnupg_fd_t out_fd, const char *iname, int mode,
if (!*a) if (!*a)
{ {
rc = gpg_error_from_syserror (); 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)); log_error (_("can't open '%s': %s\n"), xname, gpg_strerror (rc));
} }
else if (opt.verbose) 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); log_info (_("writing to '%s'\n"), xname);
} }
} }