diff options
author | NIIBE Yutaka <[email protected]> | 2024-07-03 05:23:19 +0000 |
---|---|---|
committer | NIIBE Yutaka <[email protected]> | 2024-07-03 05:23:19 +0000 |
commit | 72a1c1b8720ab484ac3bd06b0333e8e1c42a9b8a (patch) | |
tree | 8a8fafdf93e958d550ca8d8a5cd1b9cf8b01a478 | |
parent | Use gpgrt_process_spawn functions from libgpg-error. (diff) | |
download | gnupg-72a1c1b8720ab484ac3bd06b0333e8e1c42a9b8a.tar.gz gnupg-72a1c1b8720ab484ac3bd06b0333e8e1c42a9b8a.zip |
Simply use gnupg_create_pipe for normal pipe creation.
Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r-- | common/call-gpg.c | 8 | ||||
-rw-r--r-- | tests/gpgscm/ffi.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/common/call-gpg.c b/common/call-gpg.c index a4723ca43..001d38717 100644 --- a/common/call-gpg.c +++ b/common/call-gpg.c @@ -428,9 +428,9 @@ _gpg_encrypt (ctrl_t ctrl, assert ((reader_mb == NULL) != (cipher_stream == NULL)); /* Create two pipes. */ - err = gnupg_create_outbound_pipe (outbound_fds, NULL, 0); + err = gnupg_create_pipe (outbound_fds); if (!err) - err = gnupg_create_inbound_pipe (inbound_fds, NULL, 0); + err = gnupg_create_pipe (inbound_fds); if (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)); /* Create two pipes. */ - err = gnupg_create_outbound_pipe (outbound_fds, NULL, 0); + err = gnupg_create_pipe (outbound_fds); if (!err) - err = gnupg_create_inbound_pipe (inbound_fds, NULL, 0); + err = gnupg_create_pipe (inbound_fds); if (err) { log_error (_("error creating a pipe: %s\n"), gpg_strerror (err)); diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c index 1470bffbd..6a40fdbcb 100644 --- a/tests/gpgscm/ffi.c +++ b/tests/gpgscm/ffi.c @@ -1241,7 +1241,7 @@ do_inbound_pipe (scheme *sc, pointer args) FFI_PROLOG (); int filedes[2]; FFI_ARGS_DONE_OR_RETURN (sc, args); - err = gnupg_create_inbound_pipe (filedes, NULL, 0); + err = gnupg_create_pipe (filedes); #define IMC(A, B) \ _cons (sc, sc->vptr->mk_integer (sc, (unsigned long) (A)), (B), 1) FFI_RETURN_POINTER (sc, IMC (filedes[0], @@ -1255,7 +1255,7 @@ do_outbound_pipe (scheme *sc, pointer args) FFI_PROLOG (); int filedes[2]; FFI_ARGS_DONE_OR_RETURN (sc, args); - err = gnupg_create_outbound_pipe (filedes, NULL, 0); + err = gnupg_create_pipe (filedes); #define IMC(A, B) \ _cons (sc, sc->vptr->mk_integer (sc, (unsigned long) (A)), (B), 1) FFI_RETURN_POINTER (sc, IMC (filedes[0], |