[git] GnuPG - branch, master, updated. gnupg-2.1.8-29-g8eb3a17

[by Werner Koch]

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 "The GNU Privacy Guard".

The branch, master has been updated
       via  8eb3a1797a1e7cb59a8342a8aa917756fe67949f (commit)
      from  f71ed902def81f9408d9094289d8a97abaa0f609 (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 8eb3a1797a1e7cb59a8342a8aa917756fe67949f
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Sep 16 19:02:35 2015 +0200

    gpg: Fix skip function dummy parameter.
    
    * g10/trustdb.c (search_skipfnc): Fix dummy argument
    --
    
    This is required due to the prototype change in
    commit 9acbeac23668a1d0dabca27d7825430d76e095c2
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/trustdb.c b/g10/trustdb.c
index ba4ba5f..b16682d 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1559,9 +1559,9 @@ validate_one_keyblock (KBNODE kb, struct key_item *klist,
 
 
 static int
-search_skipfnc (void *opaque, u32 *kid, PKT_user_id *dummy)
+search_skipfnc (void *opaque, u32 *kid, int dummy_uid_no)
 {
-  (void)dummy;
+  (void)dummy_uid_no;
   return test_key_hash_table ((KeyHashTable)opaque, kid);
 }
 

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

Summary of changes:
 g10/trustdb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org