diff options
| author | Marcus Brinkmann <[email protected]> | 2003-05-27 02:54:36 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2003-05-27 02:54:36 +0000 |
| commit | 3d476c73de58b8a51b13a319a3a5564ce6880f78 (patch) | |
| tree | 44792a5b89c583106313473b2a810941a61c65f2 /gpgme/trustlist.c | |
| parent | 2003-05-27 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-3d476c73de58b8a51b13a319a3a5564ce6880f78.tar.gz gpgme-3d476c73de58b8a51b13a319a3a5564ce6880f78.zip | |
2003-05-27 Marcus Brinkmann <[email protected]>
* 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.
Diffstat (limited to '')
| -rw-r--r-- | gpgme/trustlist.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gpgme/trustlist.c b/gpgme/trustlist.c index ddec1b2a..a5a29158 100644 --- a/gpgme/trustlist.c +++ b/gpgme/trustlist.c @@ -126,14 +126,15 @@ _gpgme_op_trustlist_event_cb (void *data, gpgme_event_io_t type, { gpgme_ctx_t ctx = (gpgme_ctx_t) data; gpgme_error_t err; + void *hook; op_data_t opd; gpgme_trust_item_t item = (gpgme_trust_item_t) type_data; struct trust_queue_item_s *q, *q2; assert (type == GPGME_EVENT_NEXT_TRUSTITEM); - err = _gpgme_op_data_lookup (ctx, OPDATA_TRUSTLIST, (void **) &opd, - -1, NULL); + err = _gpgme_op_data_lookup (ctx, OPDATA_TRUSTLIST, &hook, -1, NULL); + opd = hook; if (err) return; @@ -165,6 +166,7 @@ gpgme_error_t gpgme_op_trustlist_start (gpgme_ctx_t ctx, const char *pattern, int max_level) { gpgme_error_t err = 0; + void *hook; op_data_t opd; if (!pattern || !*pattern) @@ -174,8 +176,9 @@ gpgme_op_trustlist_start (gpgme_ctx_t ctx, const char *pattern, int max_level) if (err) return err; - err = _gpgme_op_data_lookup (ctx, OPDATA_TRUSTLIST, (void **) &opd, + err = _gpgme_op_data_lookup (ctx, OPDATA_TRUSTLIST, &hook, sizeof (*opd), NULL); + opd = hook; if (err) return err; @@ -194,6 +197,7 @@ gpgme_error_t gpgme_op_trustlist_next (gpgme_ctx_t ctx, gpgme_trust_item_t *r_item) { gpgme_error_t err; + void *hook; op_data_t opd; struct trust_queue_item_s *q; @@ -203,8 +207,8 @@ gpgme_op_trustlist_next (gpgme_ctx_t ctx, gpgme_trust_item_t *r_item) if (!ctx) return GPGME_Invalid_Value; - err = _gpgme_op_data_lookup (ctx, OPDATA_TRUSTLIST, (void **) &opd, - -1, NULL); + err = _gpgme_op_data_lookup (ctx, OPDATA_TRUSTLIST, &hook, -1, NULL); + opd = hook; if (err) return err; |