diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2009-10-27 19:23:56 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2009-10-27 19:23:56 +0000 |
| commit | 36e2c1a9d1376057fb2b3c4ce016c2707ee49ca7 (patch) | |
| tree | eadd61642ca756ba751928f194a3e3435e98c334 /src/wait-private.c | |
| parent | c8e934b2761ded0a7c7fdaaf7f3e2e8af9e3dcaf (diff) | |
| download | gpgme-36e2c1a9d1376057fb2b3c4ce016c2707ee49ca7.tar.gz | |
2009-10-27 Marcus Brinkmann <marcus@g10code.de>
* edit.c (gpgme_op_edit_start, gpgme_op_edit)
(gpgme_op_card_edit_start, gpgme_op_card_edit): Add debug output.
* encrypt-sign.c (gpgme_op_encrypt_sign_start)
(gpgme_op_encrypt_sign): Likewise.
* encrypt.c (gpgme_op_encrypt_start, gpgme_op_encrypt)
(gpgme_op_encrypt_result): Likewise.
* export.c (gpgme_op_export_start, gpgme_op_export)
(gpgme_op_export_ext_start, gpgme_op_export_ext)
(gpgme_op_export_keys_start, gpgme_op_export_keys): Likewise.
* genkey.c (gpgme_op_genkey_start, gpgme_op_genkey)
(gpgme_op_genkey_result): Likewise.
* getauditlog.c (gpgme_op_getauditlog_start)
(gpgme_op_getauditlog): Likewise.
* import.c (gpgme_op_import_result, gpgme_op_import_start)
(gpgme_op_import): Likewise.
* keylist.c (gpgme_op_keylist_result, keylist_colon_handler)
(gpgme_op_keylist_start, gpgme_op_keylist_ext_start)
(gpgme_op_keylist_next, gpgme_op_keylist_end, gpgme_get_key): Likewise.
* opassuan.c (gpgme_op_assuan_transact_start)
(gpgme_op_assuan_transact_ext, gpgme_op_assuan_result)
(gpgme_op_assuan_transact): Likewise.
* signers.c (gpgme_signers_add, gpgme_signers_clear): Likewise.
* trustlist.c (gpgme_op_trustlist_start)
(gpgme_op_trustlist_next, gpgme_op_trustlist_end): Likewise.
* verify.c (gpgme_op_verify_start, gpgme_op_verify)
(gpgme_op_verify_result): Likewise.
Diffstat (limited to 'src/wait-private.c')
| -rw-r--r-- | src/wait-private.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/wait-private.c b/src/wait-private.c index 5d3f267c..c5cbd3cf 100644 --- a/src/wait-private.c +++ b/src/wait-private.c @@ -78,6 +78,9 @@ _gpgme_wait_on_condition (gpgme_ctx_t ctx, volatile int *cond, gpgme_error_t err = 0; int hang = 1; + if (op_err_p) + *op_err_p = 0; + do { int nr = _gpgme_io_select (ctx->fdt.fds, ctx->fdt.size, 0); @@ -90,8 +93,6 @@ _gpgme_wait_on_condition (gpgme_ctx_t ctx, volatile int *cond, err = gpg_error_from_errno (errno); _gpgme_cancel_with_err (ctx, err, 0); - if (op_err_p) - *op_err_p = 0; return err; } @@ -118,8 +119,6 @@ _gpgme_wait_on_condition (gpgme_ctx_t ctx, volatile int *cond, and signal it. */ _gpgme_cancel_with_err (ctx, err, 0); - if (op_err_p) - *op_err_p = 0; return err; } else if (op_err) @@ -157,8 +156,6 @@ _gpgme_wait_on_condition (gpgme_ctx_t ctx, volatile int *cond, } while (hang); - if (op_err_p) - *op_err_p = 0; return 0; } |