security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-22 19:58:29 +01:00
Code Activity

g10: Eliminate the redundant function get_pubkey_next.

Browse Source 
* 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>.
This commit is contained in:
Neal H. Walfield 2015-09-14 15:22:25 +02:00
parent 9acbeac236
commit be6743b2e1
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/getkey.c
View File

@ -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 void
get_pubkey_end (GETKEY_CTX ctx) get_pubkey_end (GETKEY_CTX ctx)
{ {

1
g10/keydb.h
View File

@ -407,7 +407,6 @@ int get_pubkey_byname (ctrl_t ctrl,
GETKEY_CTX *rx, PKT_public_key *pk, const char *name, GETKEY_CTX *rx, PKT_public_key *pk, const char *name,
KBNODE *ret_keyblock, KEYDB_HANDLE *ret_kdbhd, KBNODE *ret_keyblock, KEYDB_HANDLE *ret_kdbhd,
int include_unusable, int no_akl ); 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 ); void get_pubkey_end( GETKEY_CTX ctx );
gpg_error_t get_seckey (PKT_public_key *pk, u32 *keyid); gpg_error_t get_seckey (PKT_public_key *pk, u32 *keyid);
int get_pubkey_byfprint (PKT_public_key *pk, kbnode_t *r_keyblock, int get_pubkey_byfprint (PKT_public_key *pk, kbnode_t *r_keyblock,

2
g10/keylist.c
View File

@ -637,7 +637,7 @@ locate_one (ctrl_t ctrl, strlist_t names)
list_keyblock (keyblock, 0, 0, opt.fingerprint, &listctx); list_keyblock (keyblock, 0, 0, opt.fingerprint, &listctx);
release_kbnode (keyblock); release_kbnode (keyblock);
} }
while (ctx && !get_pubkey_next (ctx, NULL, &keyblock)); while (ctx && !getkey_next (ctx, NULL, &keyblock));
get_pubkey_end (ctx); get_pubkey_end (ctx);
ctx = NULL; ctx = NULL;
} }