diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/decrypt.c | 10 | ||||
| -rw-r--r-- | g10/server.c | 11 |
2 files changed, 2 insertions, 19 deletions
diff --git a/g10/decrypt.c b/g10/decrypt.c index e000ac478..64ba0b7f1 100644 --- a/g10/decrypt.c +++ b/g10/decrypt.c @@ -114,7 +114,6 @@ decrypt_message_fd (ctrl_t ctrl, gnupg_fd_t input_fd, IOBUF fp; armor_filter_context_t *afx = NULL; progress_filter_context_t *pfx; - es_syshd_t syshd; if (opt.outfp) return gpg_error (GPG_ERR_BUG); @@ -140,14 +139,7 @@ decrypt_message_fd (ctrl_t ctrl, gnupg_fd_t input_fd, return err; } -#ifdef HAVE_W32_SYSTEM - syshd.type = ES_SYSHD_HANDLE; - syshd.u.handle = output_fd; -#else - syshd.type = ES_SYSHD_FD; - syshd.u.fd = output_fd; -#endif - opt.outfp = es_sysopen_nc (&syshd, "w"); + opt.outfp = open_stream_nc (output_fd, "w"); if (!opt.outfp) { char xname[64]; diff --git a/g10/server.c b/g10/server.c index 8ddfbba8e..24e525e7f 100644 --- a/g10/server.c +++ b/g10/server.c @@ -388,16 +388,7 @@ cmd_verify (assuan_context_t ctx, char *line) if (out_fd != GNUPG_INVALID_FD) { - es_syshd_t syshd; - -#ifdef HAVE_W32_SYSTEM - syshd.type = ES_SYSHD_HANDLE; - syshd.u.handle = out_fd; -#else - syshd.type = ES_SYSHD_FD; - syshd.u.fd = out_fd; -#endif - out_fp = es_sysopen_nc (&syshd, "w"); + out_fp = open_stream_nc (fd, "w"); if (!out_fp) return set_error (gpg_err_code_from_syserror (), "fdopen() failed"); } |