aboutsummaryrefslogtreecommitdiffstats
path: root/src/decrypt.c
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2010-05-06 13:39:55 +0000
committerMarcus Brinkmann <[email protected]>2010-05-06 13:39:55 +0000
commit749325d6c10fd6a8d8fafa3c9c25b6822eaf0dc5 (patch)
tree5e43ee1064a9e68208c7ab288e08e89c814caa5f /src/decrypt.c
parent2010-04-19 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-749325d6c10fd6a8d8fafa3c9c25b6822eaf0dc5.tar.gz
gpgme-749325d6c10fd6a8d8fafa3c9c25b6822eaf0dc5.zip
2010-05-06 Marcus Brinkmann <[email protected]>
* configure.ac: Require libgpg-error 1.8. src/ 2010-05-06 Marcus Brinkmann <[email protected]> * 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 <gpg-error.h> 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.
Diffstat (limited to 'src/decrypt.c')
-rw-r--r--src/decrypt.c6
1 files changed, 3 insertions, 3 deletions
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 ();
}
}
}