1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00

Simply use gnupg_create_pipe for normal pipe creation.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2024-07-03 14:23:19 +09:00
parent 19df973df0
commit 72a1c1b872
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 6 additions and 6 deletions

View File

@ -428,9 +428,9 @@ _gpg_encrypt (ctrl_t ctrl,
assert ((reader_mb == NULL) != (cipher_stream == NULL)); assert ((reader_mb == NULL) != (cipher_stream == NULL));
/* Create two pipes. */ /* Create two pipes. */
err = gnupg_create_outbound_pipe (outbound_fds, NULL, 0); err = gnupg_create_pipe (outbound_fds);
if (!err) if (!err)
err = gnupg_create_inbound_pipe (inbound_fds, NULL, 0); err = gnupg_create_pipe (inbound_fds);
if (err) if (err)
{ {
log_error (_("error creating a pipe: %s\n"), gpg_strerror (err)); log_error (_("error creating a pipe: %s\n"), gpg_strerror (err));
@ -612,9 +612,9 @@ _gpg_decrypt (ctrl_t ctrl,
assert ((reader_mb == NULL) != (plain_stream == NULL)); assert ((reader_mb == NULL) != (plain_stream == NULL));
/* Create two pipes. */ /* Create two pipes. */
err = gnupg_create_outbound_pipe (outbound_fds, NULL, 0); err = gnupg_create_pipe (outbound_fds);
if (!err) if (!err)
err = gnupg_create_inbound_pipe (inbound_fds, NULL, 0); err = gnupg_create_pipe (inbound_fds);
if (err) if (err)
{ {
log_error (_("error creating a pipe: %s\n"), gpg_strerror (err)); log_error (_("error creating a pipe: %s\n"), gpg_strerror (err));

View File

@ -1241,7 +1241,7 @@ do_inbound_pipe (scheme *sc, pointer args)
FFI_PROLOG (); FFI_PROLOG ();
int filedes[2]; int filedes[2];
FFI_ARGS_DONE_OR_RETURN (sc, args); FFI_ARGS_DONE_OR_RETURN (sc, args);
err = gnupg_create_inbound_pipe (filedes, NULL, 0); err = gnupg_create_pipe (filedes);
#define IMC(A, B) \ #define IMC(A, B) \
_cons (sc, sc->vptr->mk_integer (sc, (unsigned long) (A)), (B), 1) _cons (sc, sc->vptr->mk_integer (sc, (unsigned long) (A)), (B), 1)
FFI_RETURN_POINTER (sc, IMC (filedes[0], FFI_RETURN_POINTER (sc, IMC (filedes[0],
@ -1255,7 +1255,7 @@ do_outbound_pipe (scheme *sc, pointer args)
FFI_PROLOG (); FFI_PROLOG ();
int filedes[2]; int filedes[2];
FFI_ARGS_DONE_OR_RETURN (sc, args); FFI_ARGS_DONE_OR_RETURN (sc, args);
err = gnupg_create_outbound_pipe (filedes, NULL, 0); err = gnupg_create_pipe (filedes);
#define IMC(A, B) \ #define IMC(A, B) \
_cons (sc, sc->vptr->mk_integer (sc, (unsigned long) (A)), (B), 1) _cons (sc, sc->vptr->mk_integer (sc, (unsigned long) (A)), (B), 1)
FFI_RETURN_POINTER (sc, IMC (filedes[0], FFI_RETURN_POINTER (sc, IMC (filedes[0],