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/getkey.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 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 0030f42c5..60429b6a1 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -2465,7 +2465,7 @@ lookup (getkey_ctx_t ctx, kbnode_t *ret_keyblock, int want_secret) int no_suitable_key = 0; rc = 0; - while (!(rc = keydb_search (ctx->kr_handle, ctx->items, ctx->nitems))) + while (!(rc = keydb_search (ctx->kr_handle, ctx->items, ctx->nitems, NULL))) { /* If we are searching for the first key we have to make sure that the next iteration does not do an implicit reset. @@ -2890,7 +2890,7 @@ have_secret_key_with_kid (u32 *keyid) desc.mode = KEYDB_SEARCH_MODE_LONG_KID; desc.u.kid[0] = keyid[0]; desc.u.kid[1] = keyid[1]; - while (!result && !(err = keydb_search (kdbhd, &desc, 1))) + while (!result && !(err = keydb_search (kdbhd, &desc, 1, NULL))) { desc.mode = KEYDB_SEARCH_MODE_NEXT; err = keydb_get_keyblock (kdbhd, &keyblock); |