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/decrypt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/decrypt.c') diff --git a/src/decrypt.c b/src/decrypt.c index 132a04ba..87ae4601 100644 --- a/src/decrypt.c +++ b/src/decrypt.c @@ -126,7 +126,7 @@ parse_enc_to (char *args, gpgme_recipient_t *recp) rec = malloc (sizeof (*rec)); if (!rec) - return gpg_error_from_errno (errno); + return gpg_error_from_syserror (); rec->next = NULL; rec->keyid = rec->_keyid; @@ -153,7 +153,7 @@ parse_enc_to (char *args, gpgme_recipient_t *recp) if (*args) { - errno = 0; + gpg_err_set_errno (0); rec->pubkey_algo = strtol (args, &tail, 0); if (errno || args == tail || *tail != ' ') { @@ -239,7 +239,7 @@ _gpgme_decrypt_status_handler (void *priv, gpgme_status_code_t code, { opd->result.unsupported_algorithm = strdup (args); if (!opd->result.unsupported_algorithm) - return gpg_error_from_errno (errno); + return gpg_error_from_syserror (); } } } -- cgit v1.2.3