diff options
| author | Justus Winter <[email protected]> | 2016-05-10 11:03:34 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2016-05-10 11:03:34 +0000 |
| commit | f531608539b45f0bbd036f430943b390ec21aa65 (patch) | |
| tree | 56cf3f4db0c38e668645668ebb3dec418bed77a5 /src/wait-private.c | |
| parent | More GTK2 removal (diff) | |
| parent | Allow cc to detect missing cases in a switch. (diff) | |
| download | gpgme-f531608539b45f0bbd036f430943b390ec21aa65.tar.gz gpgme-f531608539b45f0bbd036f430943b390ec21aa65.zip | |
Merge branch 'master' into justus/pyme3
Diffstat (limited to '')
| -rw-r--r-- | src/wait-private.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wait-private.c b/src/wait-private.c index 9a43110e..12d31805 100644 --- a/src/wait-private.c +++ b/src/wait-private.c @@ -89,7 +89,7 @@ _gpgme_wait_on_condition (gpgme_ctx_t ctx, volatile int *cond, if (nr < 0) { - /* An error occured. Close all fds in this context, and + /* An error occurred. Close all fds in this context, and signal it. */ err = gpg_error_from_syserror (); _gpgme_cancel_with_err (ctx, err, 0); @@ -116,7 +116,7 @@ _gpgme_wait_on_condition (gpgme_ctx_t ctx, volatile int *cond, err = _gpgme_run_io_cb (&ctx->fdt.fds[i], 0, &op_err); if (err) { - /* An error occured. Close all fds in this context, + /* An error occurred. Close all fds in this context, and signal it. */ _gpgme_cancel_with_err (ctx, err, 0); @@ -124,7 +124,7 @@ _gpgme_wait_on_condition (gpgme_ctx_t ctx, volatile int *cond, } else if (op_err) { - /* An operational error occured. Cancel the current + /* An operational error occurred. Cancel the current operation but not the session, and signal it. */ _gpgme_cancel_with_err (ctx, 0, op_err); |