diff options
| author | NIIBE Yutaka <[email protected]> | 2020-11-20 06:35:27 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2020-11-20 08:19:45 +0000 |
| commit | 777019faf0b8f10a897c3ee477d35f9b29f02224 (patch) | |
| tree | 05874c988358062f7ab789c841ff5429ec645c4d /g10/card-util.c | |
| parent | Fix the previous comment changes help doc string. (diff) | |
| download | gnupg-777019faf0b8f10a897c3ee477d35f9b29f02224.tar.gz gnupg-777019faf0b8f10a897c3ee477d35f9b29f02224.zip | |
gpg: Change API of agent_scd_serialno.
* g10/call-agent.c (agent_scd_serialno): Extend API to allow with
R_SERIALNO == NULL.
* g10/card-util.c (card_status): Use NULL for agent_scd_serialno.
(factory_reset): Likewise.
* g10/skclist.c (build_sk_list): Likewise.
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'g10/card-util.c')
| -rw-r--r-- | g10/card-util.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/g10/card-util.c b/g10/card-util.c index 4da4a53c8..36f096f06 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -689,7 +689,6 @@ card_status (ctrl_t ctrl, estream_t fp, const char *serialno) int err; strlist_t card_list, sl; char *serialno0 = NULL; - char *serialno1 = NULL; int all_cards = 0; int any_card = 0; @@ -723,7 +722,7 @@ card_status (ctrl_t ctrl, estream_t fp, const char *serialno) tty_fprintf (fp, "\n"); any_card = 1; - err = agent_scd_serialno (&serialno1, sl->d); + err = agent_scd_serialno (NULL, sl->d); if (err) { if (opt.verbose) @@ -733,19 +732,16 @@ card_status (ctrl_t ctrl, estream_t fp, const char *serialno) } current_card_status (ctrl, fp, NULL, 0); - xfree (serialno1); - serialno1 = NULL; if (!all_cards) goto leave; } /* Select the original card again. */ - err = agent_scd_serialno (&serialno1, serialno0); + err = agent_scd_serialno (NULL, serialno0); leave: xfree (serialno0); - xfree (serialno1); free_strlist (card_list); } @@ -2010,12 +2006,7 @@ factory_reset (void) /* Then, connect the card again. */ if (!err) - { - char *serialno0; - - err = agent_scd_serialno (&serialno0, NULL); - xfree (serialno0); - } + err = agent_scd_serialno (NULL, NULL); leave: if (locked) |