diff options
| author | Neal H. Walfield <neal@g10code.com> | 2015-09-14 15:22:25 +0200 |
|---|---|---|
| committer | Neal H. Walfield <neal@g10code.com> | 2015-09-16 15:15:20 +0200 |
| commit | be6743b2e19241f66148bf89c3442d8e2ebcd63e (patch) | |
| tree | f27a1d27cfe7a81c0bc5905998f884b77d7b68dd /g10 | |
| parent | kbx: Change skipfnc's prototype so that we can provide all information. (diff) | |
| download | gnupg2-be6743b2e19241f66148bf89c3442d8e2ebcd63e.tar.xz gnupg2-be6743b2e19241f66148bf89c3442d8e2ebcd63e.zip | |
g10: Eliminate the redundant function get_pubkey_next.
* g10/keydb.h (get_pubkey_next): Remove prototype.
* g10/getkey.c (get_pubkey_next): Remove function.
* g10/keylist.c (locate_one): Use getkey_next instead of
get_pubkey_next.
--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/getkey.c | 6 | ||||
| -rw-r--r-- | g10/keydb.h | 1 | ||||
| -rw-r--r-- | g10/keylist.c | 2 |
3 files changed, 1 insertions, 8 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 56dbfa0b6..4e031f2da 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -926,12 +926,6 @@ get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX * retctx, PKT_public_key * pk, } -int -get_pubkey_next (GETKEY_CTX ctx, PKT_public_key * pk, KBNODE * ret_keyblock) -{ - return gpg_err_code (getkey_next (ctx, pk, ret_keyblock)); -} - void get_pubkey_end (GETKEY_CTX ctx) { diff --git a/g10/keydb.h b/g10/keydb.h index bd018d123..525d78c27 100644 --- a/g10/keydb.h +++ b/g10/keydb.h @@ -407,7 +407,6 @@ int get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX *rx, PKT_public_key *pk, const char *name, KBNODE *ret_keyblock, KEYDB_HANDLE *ret_kdbhd, int include_unusable, int no_akl ); -int get_pubkey_next( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock ); void get_pubkey_end( GETKEY_CTX ctx ); gpg_error_t get_seckey (PKT_public_key *pk, u32 *keyid); int get_pubkey_byfprint (PKT_public_key *pk, kbnode_t *r_keyblock, diff --git a/g10/keylist.c b/g10/keylist.c index cc92d1a0d..8ced5ad9e 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -637,7 +637,7 @@ locate_one (ctrl_t ctrl, strlist_t names) list_keyblock (keyblock, 0, 0, opt.fingerprint, &listctx); release_kbnode (keyblock); } - while (ctx && !get_pubkey_next (ctx, NULL, &keyblock)); + while (ctx && !getkey_next (ctx, NULL, &keyblock)); get_pubkey_end (ctx); ctx = NULL; } |