[git] GPGME - branch, master, updated. gpgme-1.6.0-4-g0d9d0a6

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  0d9d0a6b5b0c6f474a079bbaef11078c5df5f3b5 (commit)
      from  f0ccce855bd99fca7cfbbcafe3544e3113fedc67 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0d9d0a6b5b0c6f474a079bbaef11078c5df5f3b5
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 16 09:51:42 2015 +0900

    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.

diff --git a/src/data-compat.c b/src/data-compat.c
index 99827f1..abb7863 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 343e775..3c4e8e9 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));

-----------------------------------------------------------------------

Summary of changes:
 src/data-compat.c | 2 +-
 src/gpgme.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org