From 3d476c73de58b8a51b13a319a3a5564ce6880f78 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Tue, 27 May 2003 02:54:36 +0000 Subject: 2003-05-27 Marcus Brinkmann * encrypt.c (gpgme_op_encrypt_result): Use intermediate variable HOOK to avoid compiler warning. Don't ask, you don't want to know. (_gpgme_encrypt_status_handler): Likewise. (_gpgme_op_encrypt_init_result): Likewise. * decrypt.c (gpgme_op_decrypt_result): Likewise. (_gpgme_decrypt_status_handler): Likewise. (_gpgme_op_decrypt_init_result): Likewise. * verify.c (gpgme_op_verify_result): Likewise. (_gpgme_verify_status_handler): Likewise. (_gpgme_op_verify_init_result): Likewise. * edit.c (edit_status_handler): Likewise. (command_handler): Likewise. (edit_start): Likewise. * genkey.c (gpgme_op_genkey_result): Likewise. (genkey_status_handler): Likewise. (genkey_start): Likewise. * import.c (gpgme_op_import_result): Likewise. (import_status_handler): Likewise. (_gpgme_op_import_start): Likewise. * trustlist.c (gpgme_op_trustlist_next): Likewise. (_gpgme_op_trustlist_event_cb): Likewise. (gpgme_op_trustlist_start): Likewise. * keylist.c (gpgme_op_keylist_result): Likewise. (keylist_colon_handler): Likewise. (keylist_status_handler): Likewise. (_gpgme_op_keylist_event_cb): Likewise. (gpgme_op_keylist_start): Likewise. (gpgme_op_keylist_ext_start): Likewise. (gpgme_op_keylist_next): Likewise. * passphrase.c (_gpgme_passphrase_status_handler): Likewise. (_gpgme_passphrase_command_handler_internal): Likewise. * sign.c (gpgme_op_sign_result): Likewise. (_gpgme_sign_status_handler): Likewise. (_gpgme_op_sign_init_result): Likewise. --- gpgme/encrypt.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gpgme/encrypt.c') diff --git a/gpgme/encrypt.c b/gpgme/encrypt.c index b98f55a5..485158a4 100644 --- a/gpgme/encrypt.c +++ b/gpgme/encrypt.c @@ -59,10 +59,13 @@ release_op_data (void *hook) gpgme_encrypt_result_t gpgme_op_encrypt_result (gpgme_ctx_t ctx) { + void *hook; op_data_t opd; gpgme_error_t err; - err = _gpgme_op_data_lookup (ctx, OPDATA_ENCRYPT, (void **) &opd, -1, NULL); + err = _gpgme_op_data_lookup (ctx, OPDATA_ENCRYPT, &hook, -1, NULL); + opd = hook; + if (err || !opd) return NULL; @@ -76,10 +79,11 @@ _gpgme_encrypt_status_handler (void *priv, gpgme_status_code_t code, { gpgme_ctx_t ctx = (gpgme_ctx_t) priv; gpgme_error_t err; + void *hook; op_data_t opd; - err = _gpgme_op_data_lookup (ctx, OPDATA_ENCRYPT, (void **) &opd, - -1, NULL); + err = _gpgme_op_data_lookup (ctx, OPDATA_ENCRYPT, &hook, -1, NULL); + opd = hook; if (err) return err; @@ -129,12 +133,15 @@ gpgme_error_t _gpgme_op_encrypt_init_result (gpgme_ctx_t ctx) { gpgme_error_t err; + void *hook; op_data_t opd; - err = _gpgme_op_data_lookup (ctx, OPDATA_ENCRYPT, (void **) &opd, - sizeof (*opd), release_op_data); + err = _gpgme_op_data_lookup (ctx, OPDATA_ENCRYPT, &hook, sizeof (*opd), + release_op_data); + opd = hook; if (err) return err; + opd->lastp = &opd->result.invalid_recipients; return 0; } -- cgit v1.2.3