From 3de5ef759895837fe499cff7fb1fa7798e6d5754 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Wed, 14 Oct 2015 18:57:26 +0900
Subject: [PATCH] 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 a0a51045c..64836e2eb 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 4b14b2f23..2eaae86aa 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];