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-mem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/data-mem.c') diff --git a/src/data-mem.c b/src/data-mem.c index 5dca89a0..7be72bff 100644 --- a/src/data-mem.c +++ b/src/data-mem.c @@ -115,7 +115,7 @@ mem_seek (gpgme_data_t dh, off_t offset, int whence) case SEEK_SET: if (offset < 0 || offset > dh->data.mem.length) { - errno = EINVAL; + gpg_err_set_errno (EINVAL); return -1; } dh->data.mem.offset = offset; @@ -124,7 +124,7 @@ mem_seek (gpgme_data_t dh, off_t offset, int whence) if ((offset > 0 && dh->data.mem.length - dh->data.mem.offset < offset) || (offset < 0 && dh->data.mem.offset < -offset)) { - errno = EINVAL; + gpg_err_set_errno (EINVAL); return -1; } dh->data.mem.offset += offset; @@ -132,13 +132,13 @@ mem_seek (gpgme_data_t dh, off_t offset, int whence) case SEEK_END: if (offset > 0 || -offset > dh->data.mem.length) { - errno = EINVAL; + gpg_err_set_errno (EINVAL); return -1; } dh->data.mem.offset = dh->data.mem.length - offset; break; default: - errno = EINVAL; + gpg_err_set_errno (EINVAL); return -1; } return dh->data.mem.offset; -- cgit v1.2.3