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/w32-util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/w32-util.c') diff --git a/src/w32-util.c b/src/w32-util.c index bc186022..ef524f7f 100644 --- a/src/w32-util.c +++ b/src/w32-util.c @@ -524,7 +524,7 @@ mkstemp (char *tmpl) len = strlen (tmpl); if (len < 6 || strcmp (&tmpl[len - 6], "XXXXXX")) { - errno = EINVAL; + gpg_err_set_errno (EINVAL); return -1; } @@ -561,7 +561,7 @@ mkstemp (char *tmpl) fd = open (tmpl, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); if (fd >= 0) { - errno = save_errno; + gpg_err_set_errno (save_errno); return fd; } else if (errno != EEXIST) @@ -569,7 +569,7 @@ mkstemp (char *tmpl) } /* We got out of the loop because we ran out of combinations to try. */ - errno = EEXIST; + gpg_err_set_errno (EEXIST); return -1; } -- cgit v1.2.3