diff options
| author | Werner Koch <[email protected]> | 2018-05-31 21:56:06 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-05-31 22:13:52 +0000 |
| commit | 2219fc19d58ae1071493de92093b711f3c71454a (patch) | |
| tree | 9d8953ad3f6e81b8ecfac928fb5068445f2adf41 | |
| parent | cpp: Add gpgme_data_rewind to cpp API (diff) | |
| download | gpgme-2219fc19d58ae1071493de92093b711f3c71454a.tar.gz gpgme-2219fc19d58ae1071493de92093b711f3c71454a.zip | |
core: Minor cleanup in engine-gpg and -gpgsm.
* src/engine-gpg.c: Remove errno.h.
(build_argv): Use gpg_error_from_syserror instead of ERRNO.
* src/engine-gpgsm.c: Remove errno.h.
(status_handler): Remove check for EINTR; gpgme_data_write already
handles EINTR.
Signed-off-by: Werner Koch <[email protected]>
| -rw-r--r-- | src/engine-gpg.c | 5 | ||||
| -rw-r--r-- | src/engine-gpgsm.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/engine-gpg.c b/src/engine-gpg.c index 173e940c..e9558202 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -26,7 +26,6 @@ #include <stdlib.h> #include <string.h> #include <assert.h> -#include <errno.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -1039,10 +1038,10 @@ build_argv (engine_gpg_t gpg, const char *pgmname) if (_gpgme_io_pipe (fds, fd_data_map[datac].inbound ? 1 : 0) == -1) { - int saved_errno = errno; + int saved_err = gpg_error_from_syserror (); free (fd_data_map); free_argv (argv); - return gpg_error (saved_errno); + return saved_err; } if (_gpgme_io_set_close_notify (fds[0], close_notify_handler, gpg) diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c index 7b221831..84a9315d 100644 --- a/src/engine-gpgsm.c +++ b/src/engine-gpgsm.c @@ -37,7 +37,6 @@ #include <locale.h> #endif #include <fcntl.h> /* FIXME */ -#include <errno.h> #include "gpgme.h" #include "util.h" @@ -986,8 +985,7 @@ status_handler (void *opaque, int fd) while (linelen > 0) { nwritten = gpgme_data_write (gpgsm->inline_data, src, linelen); - if (!nwritten || (nwritten < 0 && errno != EINTR) - || nwritten > linelen) + if (nwritten <= 0 || nwritten > linelen) { err = gpg_error_from_syserror (); break; |