GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Fix error return value of _gpgme_run_io_cb.

Browse Source 
* src/wait.c (_gpgme_run_io_cb): Fix return code.
--

The function needs to return an gpg_error_t and not ERRNO.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2019-06-06 18:53:23 +02:00
parent e6f2827306
commit 6b9ff1ba39
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wait.c
View File

@ -179,7 +179,8 @@ _gpgme_remove_io_cb (void *data)
own event loops could compensate for that, but the external event own event loops could compensate for that, but the external event
loops cannot. FIXME: We may still want to optimize this a bit when loops cannot. FIXME: We may still want to optimize this a bit when
we are called from our own event loops. So if CHECKED is 1, the we are called from our own event loops. So if CHECKED is 1, the
check is skipped. */ check is skipped. FIXME: Give an example on how the status of other
fds can be influenced. */
gpgme_error_t gpgme_error_t
_gpgme_run_io_cb (struct io_select_fd_s *an_fds, int checked, _gpgme_run_io_cb (struct io_select_fd_s *an_fds, int checked,
gpgme_error_t *op_err) gpgme_error_t *op_err)
@ -203,12 +204,14 @@ _gpgme_run_io_cb (struct io_select_fd_s *an_fds, int checked,
nr = _gpgme_io_select (&fds, 1, 1); nr = _gpgme_io_select (&fds, 1, 1);
assert (nr <= 1); assert (nr <= 1);
if (nr < 0) if (nr < 0)
return errno; return gpg_error_from_syserror ();
else if (nr == 0) else if (nr == 0)
{
/* The status changed in the meantime, there is nothing left /* The status changed in the meantime, there is nothing left
to do. */ * to do. */
return 0; return 0;
} }
}
TRACE (DEBUG_CTX, "_gpgme_run_io_cb", item, "handler (%p, %d)", TRACE (DEBUG_CTX, "_gpgme_run_io_cb", item, "handler (%p, %d)",
item->handler_value, an_fds->fd); item->handler_value, an_fds->fd);