aboutsummaryrefslogtreecommitdiffstats
path: root/kbx
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2023-07-07 06:07:34 +0000
committerNIIBE Yutaka <[email protected]>2023-07-10 02:22:43 +0000
commit37343db08f4aaa36a0f58d2ecf50e7fbba4cacd7 (patch)
treebe0f1034812739c231bd3871ceeb36ca8a4009cf /kbx
parentcommon:w32: Fix gnupg_w32_set_errno. (diff)
downloadgnupg-37343db08f4aaa36a0f58d2ecf50e7fbba4cacd7.tar.gz
gnupg-37343db08f4aaa36a0f58d2ecf50e7fbba4cacd7.zip
common,gpg,kbx: Factor out open_stream_nc.
* common/sysutils.h (open_stream_nc): New. * common/sysutils.c (open_stream_nc): New. * g10/decrypt.c (decrypt_message_fd): Use open_stream_nc. * g10/server.c (cmd_verify): Likewise. * kbx/kbxserver.c (prepare_outstream): Likewise. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'kbx')
-rw-r--r--kbx/kbxserver.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/kbx/kbxserver.c b/kbx/kbxserver.c
index cc122fad5..d50b9dfdf 100644
--- a/kbx/kbxserver.c
+++ b/kbx/kbxserver.c
@@ -144,16 +144,7 @@ prepare_outstream (ctrl_t ctrl)
return 0; /* No Output command active. */
else
{
- es_syshd_t syshd;
-
-#ifdef HAVE_W32_SYSTEM
- syshd.type = ES_SYSHD_HANDLE;
- syshd.u.handle = fd;
-#else
- syshd.type = ES_SYSHD_FD;
- syshd.u.fd = fd;
-#endif
- out_fp = es_sysopen_nc (&syshd, "w");
+ out_fp = open_stream_nc (fd, "w");
if (!out_fp)
return gpg_err_code_from_syserror ();
}