[Pkg-gnupg-commit] [gnupg2] 04/241: cleanup: Fix confusion between gpg_error_t and gpg_err_code_t.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 3de5ef759895837fe499cff7fb1fa7798e6d5754
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Oct 14 18:57:26 2015 +0900

    cleanup: Fix confusion between gpg_error_t and gpg_err_code_t.
    
    * dirmngr/crlcache.c (hash_dbfile): Use gpg_error_t for ERR.
    * kbx/keybox-update.c (keybox_set_flags): Call
    gpg_err_code_from_syserror.
---
 dirmngr/crlcache.c  | 2 +-
 kbx/keybox-update.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dirmngr/crlcache.c b/dirmngr/crlcache.c
index a0a5104..64836e2 100644
--- a/dirmngr/crlcache.c
+++ b/dirmngr/crlcache.c
@@ -994,7 +994,7 @@ hash_dbfile (const char *fname, unsigned char *md5buffer)
   char *buffer;
   size_t n;
   gcry_md_hd_t md5;
-  gpg_err_code_t err;
+  gpg_error_t err;
 
   buffer = xtrymalloc (65536);
   fp = buffer? es_fopen (fname, "rb") : NULL;
diff --git a/kbx/keybox-update.c b/kbx/keybox-update.c
index 4b14b2f..2eaae86 100644
--- a/kbx/keybox-update.c
+++ b/kbx/keybox-update.c
@@ -603,7 +603,7 @@ keybox_set_flags (KEYBOX_HANDLE hd, int what, int idx, unsigned int value)
 
   ec = 0;
   if (fseeko (fp, off, SEEK_SET))
-    ec = gpg_error_from_syserror ();
+    ec = gpg_err_code_from_syserror ();
   else
     {
       unsigned char tmp[4];

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git