From 8c63430d1a40a70ff8b4ddf1ed0fcabf9c0afbcc Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 12 Feb 2020 17:29:51 +0100 Subject: gpg: Rename the struct card_key_info_s. * g10/call-agent.h (struct card_key_info_s): Rename to ... (struct keypair_info_s): this. (keypair_info_t): New. Use this everywhere instead of card_key_info_s. * g10/call-agent.c (agent_scd_free_keyinfo): Rename to .. (free_keypair_info): this. Change all callers. -- The struct is also useful to store the data from KEYPAIRINFO status lines. Thus renaming it makes sense. A future patch will extend the struct. Signed-off-by: Werner Koch --- g10/skclist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'g10/skclist.c') diff --git a/g10/skclist.c b/g10/skclist.c index b16f680a7..a4dffe3d7 100644 --- a/g10/skclist.c +++ b/g10/skclist.c @@ -330,8 +330,8 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk) int eof; int state; strlist_t sl; - struct card_key_info_s *card_keyinfo; - struct card_key_info_s *card_keyinfo_list; + keypair_info_t card_keyinfo; + keypair_info_t card_keyinfo_list; char fpr2[2 * MAX_FINGERPRINT_LEN + 2 ]; kbnode_t keyblock; kbnode_t node; @@ -359,7 +359,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk) if (!sk) { /* Free the context. */ - agent_scd_free_keyinfo (c->card_keyinfo_list); + free_keypair_info (c->card_keyinfo_list); release_sk_list (c->results); release_kbnode (c->keyblock); getkey_end (ctrl, c->ctx); -- cgit v1.2.3