aboutsummaryrefslogtreecommitdiffstats
path: root/src/wait-private.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/wait-private.c')
-rw-r--r--src/wait-private.c9
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;
}