aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine-gpgsm.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2018-05-31 21:56:06 +0000
committerWerner Koch <[email protected]>2018-05-31 22:13:52 +0000
commit2219fc19d58ae1071493de92093b711f3c71454a (patch)
tree9d8953ad3f6e81b8ecfac928fb5068445f2adf41 /src/engine-gpgsm.c
parentcpp: Add gpgme_data_rewind to cpp API (diff)
downloadgpgme-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]>
Diffstat (limited to 'src/engine-gpgsm.c')
-rw-r--r--src/engine-gpgsm.c4
1 files changed, 1 insertions, 3 deletions
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;