diff options
| author | Werner Koch <[email protected]> | 2013-01-08 08:43:21 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-01-08 08:43:21 +0000 |
| commit | f3f5721e6843a08d1011875400f385b8cd5fe226 (patch) | |
| tree | 430c4e164be67231566523e2c484682d63b63174 /g10/trustdb.c | |
| parent | gpg: Set the node flags while retrieving a keyblock. (diff) | |
| download | gnupg-f3f5721e6843a08d1011875400f385b8cd5fe226.tar.gz gnupg-f3f5721e6843a08d1011875400f385b8cd5fe226.zip | |
gpg: Remove a function wrapper.
* g10/keydb.h (keydb_search): Remove macro.
* g10/keydb.c (keydb_search2): Rename to keydb_search. Change all
callers.
Diffstat (limited to '')
| -rw-r--r-- | g10/trustdb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/g10/trustdb.c b/g10/trustdb.c index 6b228d209..24ed9dffa 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -2110,7 +2110,7 @@ validate_key_list (KEYDB_HANDLE hd, KeyHashTable full_trust, desc.mode = KEYDB_SEARCH_MODE_FIRST; desc.skipfnc = search_skipfnc; desc.skipfncvalue = full_trust; - rc = keydb_search (hd, &desc, 1); + rc = keydb_search (hd, &desc, 1, NULL); if (gpg_err_code (rc) == GPG_ERR_NOT_FOUND) { keys[nkeys].keyblock = NULL; @@ -2184,7 +2184,8 @@ validate_key_list (KEYDB_HANDLE hd, KeyHashTable full_trust, release_kbnode (keyblock); keyblock = NULL; } - while ( !(rc = keydb_search (hd, &desc, 1)) ); + while (!(rc = keydb_search (hd, &desc, 1, NULL))); + if (rc && gpg_err_code (rc) != GPG_ERR_NOT_FOUND) { log_error ("keydb_search_next failed: %s\n", g10_errstr(rc)); |