aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2015-10-16 00:51:42 +0000
committerNIIBE Yutaka <[email protected]>2015-10-16 00:51:42 +0000
commit0d9d0a6b5b0c6f474a079bbaef11078c5df5f3b5 (patch)
tree99473c253d5bb41aa8494ec7a4f131734030c1f3 /src
parentgpgme-tool: Switch to argparse.c for option parsing. (diff)
downloadgpgme-0d9d0a6b5b0c6f474a079bbaef11078c5df5f3b5.tar.gz
gpgme-0d9d0a6b5b0c6f474a079bbaef11078c5df5f3b5.zip
cleanup: Fix type mismatch around gpgme_error_t.
* src/data-compat.c (gpgme_error_to_errno): Use gpg_err_code to get error code from gpgme_error_t. * src/gpgme.c (gpgme_new): Don't use gpgme_error.
Diffstat (limited to 'src')
-rw-r--r--src/data-compat.c2
-rw-r--r--src/gpgme.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/data-compat.c b/src/data-compat.c
index 99827f16..abb78637 100644
--- a/src/data-compat.c
+++ b/src/data-compat.c
@@ -146,7 +146,7 @@ gpgme_data_new_from_file (gpgme_data_t *r_dh, const char *fname, int copy)
static int
gpgme_error_to_errno (gpgme_error_t err)
{
- int res = gpg_err_code_to_errno (err);
+ int res = gpg_err_code_to_errno (gpg_err_code (err));
if (!err)
{
diff --git a/src/gpgme.c b/src/gpgme.c
index 343e7752..3c4e8e92 100644
--- a/src/gpgme.c
+++ b/src/gpgme.c
@@ -91,7 +91,7 @@ gpgme_new (gpgme_ctx_t *r_ctx)
TRACE_BEG (DEBUG_CTX, "gpgme_new", r_ctx);
if (_gpgme_selftest)
- return TRACE_ERR (gpgme_error (_gpgme_selftest));
+ return TRACE_ERR (_gpgme_selftest);
if (!r_ctx)
return TRACE_ERR (gpg_error (GPG_ERR_INV_VALUE));