security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

g10: Remove unused function (get_pubkey_bynames).

Browse Source 
* g10/keydb.h (get_pubkey_bynames): Remove prototype.
* g10/getkey.c (get_pubkey_bynames): Remove function.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>.
This commit is contained in:
Neal H. Walfield 2015-09-09 21:22:08 +02:00
parent d47e84946e
commit b06f96ba4f
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
g10/getkey.c
View File

@ -51,7 +51,6 @@ struct getkey_ctx_s
{ {
int exact; int exact;
int want_secret; /* The caller requested only secret keys. */ int want_secret; /* The caller requested only secret keys. */
strlist_t extra_list; /* Will be freed when releasing the context. */
int req_usage; int req_usage;
KEYDB_HANDLE kr_handle; KEYDB_HANDLE kr_handle;
int not_allocated; int not_allocated;
@ -911,24 +910,11 @@ get_pubkey_byname (ctrl_t ctrl, GETKEY_CTX * retctx, PKT_public_key * pk,
*retctx = NULL; *retctx = NULL;
} }
if (retctx && *retctx)
{
assert (!(*retctx)->extra_list);
(*retctx)->extra_list = namelist;
}
else
free_strlist (namelist); free_strlist (namelist);
return rc; return rc;
} }
int
get_pubkey_bynames (GETKEY_CTX * retctx, PKT_public_key * pk,
strlist_t names, KBNODE * ret_keyblock)
{
return key_byname (retctx, names, pk, 0, 1, ret_keyblock, NULL);
}
int int
get_pubkey_next (GETKEY_CTX ctx, PKT_public_key * pk, KBNODE * ret_keyblock) get_pubkey_next (GETKEY_CTX ctx, PKT_public_key * pk, KBNODE * ret_keyblock)
{ {
@ -1277,7 +1263,6 @@ getkey_end (getkey_ctx_t ctx)
if (ctx) if (ctx)
{ {
keydb_release (ctx->kr_handle); keydb_release (ctx->kr_handle);
free_strlist (ctx->extra_list);
if (!ctx->not_allocated) if (!ctx->not_allocated)
xfree (ctx); xfree (ctx);
} }

2
g10/keydb.h
View File

@ -407,8 +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_bynames( GETKEY_CTX *rx, PKT_public_key *pk,
strlist_t names, KBNODE *ret_keyblock );
int get_pubkey_next( GETKEY_CTX ctx, PKT_public_key *pk, KBNODE *ret_keyblock ); 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);