From 749325d6c10fd6a8d8fafa3c9c25b6822eaf0dc5 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 6 May 2010 13:39:55 +0000 Subject: 2010-05-06 Marcus Brinkmann * configure.ac: Require libgpg-error 1.8. src/ 2010-05-06 Marcus Brinkmann * sign.c, data-user.c, conversion.c, debug.c, verify.c, data.c, decrypt.c, delete.c, assuan-support.c, import.c, engine-gpgsm.c, data-mem.c, op-support.c, w32-io.c, w32-util.c, data-compat.c: Use gpg_error_from_syserror instead gpg_error_from_errno, and use gpg_err_set_errno to set error number. * setenv.c: Include and define __set_errno to use gpg_err_set_errno. * gpgme-tool.c (ARGP_ERR_UNKNOWN): Define to EDEADLOCK (which is mapped in Windows CE) instead of E2BIG (which is not). (gt_import_keys): Initialize err. --- src/data-compat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/data-compat.c') diff --git a/src/data-compat.c b/src/data-compat.c index cabe24e2..76d6cd00 100644 --- a/src/data-compat.c +++ b/src/data-compat.c @@ -158,7 +158,7 @@ gpgme_error_to_errno (gpgme_error_t err) TRACE3 (DEBUG_DATA, "gpgme:gpgme_error_to_errno", 0, "mapping %s <%s> to: %s", gpgme_strerror (err), gpgme_strsource (err), strerror (res)); - errno = res; + gpg_err_set_errno (res); return res ? -1 : 0; } @@ -188,7 +188,7 @@ old_user_seek (gpgme_data_t dh, off_t offset, int whence) if (whence != SEEK_SET || offset) { - errno = EINVAL; + gpg_err_set_errno (EINVAL); return TRACE_SYSRES (-1); } err = (*dh->data.old_user.cb) (dh->data.old_user.handle, NULL, 0, NULL); -- cgit v1.2.3