diff options
| author | Werner Koch <[email protected]> | 2020-02-12 16:29:51 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-02-12 16:29:51 +0000 |
| commit | 8c63430d1a40a70ff8b4ddf1ed0fcabf9c0afbcc (patch) | |
| tree | 3d09e30b1948e41cb0524c4aa01ebd2642b2dbd2 /g10/skclist.c | |
| parent | card: Fix parsing of the received card_list. (diff) | |
| download | gnupg-8c63430d1a40a70ff8b4ddf1ed0fcabf9c0afbcc.tar.gz gnupg-8c63430d1a40a70ff8b4ddf1ed0fcabf9c0afbcc.zip | |
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 <[email protected]>
Diffstat (limited to 'g10/skclist.c')
| -rw-r--r-- | g10/skclist.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |