diff options
| author | Werner Koch <[email protected]> | 2018-05-31 22:13:18 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-05-31 22:13:53 +0000 |
| commit | e2aa38b56a991a0da052acfe7566cc7a146d3bb6 (patch) | |
| tree | 8abbd8519eda5cebdd2751b32ba4aeb86f3bf8ed /src/genkey.c | |
| parent | core: Minor cleanup in engine-gpg and -gpgsm. (diff) | |
| download | gpgme-e2aa38b56a991a0da052acfe7566cc7a146d3bb6.tar.gz gpgme-e2aa38b56a991a0da052acfe7566cc7a146d3bb6.zip | |
core: Remove cruft from the engine-gpg code.
* src/engine-gpg.c (read_status): Remove the handling of
GPGME_STATUS_END_STREAM; this was used only by the former experimental
--pipemode of gpg but that is not even anymore invoked here.
(struct engine_gpg): Remove cmd.linked_data and .linked_idx.
(build_argv): Remove code for linked_data.
(gpg_new): Ditto.
(gpg_set_command_handler): Remove arr linked_data.
* src/engine-backend.h (engine_ops): Remove arg data from
set_command_handler.
* src/engine.c (_gpgme_engine_set_command_handler): Remove arg
linked_data and adjust all callers.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'src/genkey.c')
| -rw-r--r-- | src/genkey.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/genkey.c b/src/genkey.c index 16484ecc..ffca7e8e 100644 --- a/src/genkey.c +++ b/src/genkey.c @@ -259,7 +259,7 @@ genkey_start (gpgme_ctx_t ctx, int synchronous, const char *parms, if (ctx->passphrase_cb) { err = _gpgme_engine_set_command_handler - (ctx->engine, _gpgme_passphrase_command_handler, ctx, NULL); + (ctx->engine, _gpgme_passphrase_command_handler, ctx); if (err) return err; } @@ -345,7 +345,7 @@ createkey_start (gpgme_ctx_t ctx, int synchronous, if (ctx->passphrase_cb) { err = _gpgme_engine_set_command_handler - (ctx->engine, _gpgme_passphrase_command_handler, ctx, NULL); + (ctx->engine, _gpgme_passphrase_command_handler, ctx); if (err) return err; } @@ -433,7 +433,7 @@ createsubkey_start (gpgme_ctx_t ctx, int synchronous, if (ctx->passphrase_cb) { err = _gpgme_engine_set_command_handler - (ctx->engine, _gpgme_passphrase_command_handler, ctx, NULL); + (ctx->engine, _gpgme_passphrase_command_handler, ctx); if (err) return err; } @@ -519,7 +519,7 @@ addrevuid_start (gpgme_ctx_t ctx, int synchronous, int extraflags, if (ctx->passphrase_cb) { err = _gpgme_engine_set_command_handler - (ctx->engine, _gpgme_passphrase_command_handler, ctx, NULL); + (ctx->engine, _gpgme_passphrase_command_handler, ctx); if (err) return err; } |