From 37343db08f4aaa36a0f58d2ecf50e7fbba4cacd7 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 7 Jul 2023 15:07:34 +0900 Subject: 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 --- kbx/kbxserver.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'kbx/kbxserver.c') 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 (); } -- cgit