diff options
| author | Werner Koch <[email protected]> | 2011-12-13 15:55:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-12-13 15:55:42 +0000 |
| commit | 24e121ef261731069868ca403b818f1168237f53 (patch) | |
| tree | 358c72a405ba2c2688c1bf50e7201181f3aa76d3 /scd/scdaemon.c | |
| parent | scd: Retry command SERIALNO for an inactive card. (diff) | |
| download | gnupg-24e121ef261731069868ca403b818f1168237f53.tar.gz gnupg-24e121ef261731069868ca403b818f1168237f53.zip | |
scd: Introduce a virtual reader table.
The vreader table makes the code more clear by explicitly talking
about APDU slots and reader indices. It also accommodates for future
extensions.
* scd/scdaemon.h (server_control_s): Remove READER_SLOT.
* scd/scdaemon.c (scd_init_default_ctrl): Do not init READER_SLOT.
* scd/app.c (check_application_conflict): Add arg SLOT.
* scd/command.c (slot_status_s): Rename to vreader_s.
(server_local_s): Add field VREADER_IDX as replacement for
the READER_SLOT in server_control_s. Change all users.
(slot_table): Rename to vreader_table. Change all users.
(vreader_slot): New.
(do_reset, cmd_apdu): Map vreader to apdu slot.
(get_reader_slot): Rename to get_current_reader. Return -1 on error.
(open_card): Map vreader toapdu slot. Pass slot to
check_application_conflict.
(scd_command_handler): Init VREADER_IDX.
(update_reader_status_file): Reset SLOT field on error.
Diffstat (limited to 'scd/scdaemon.c')
| -rw-r--r-- | scd/scdaemon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 0999847ef..b4eee396e 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -913,7 +913,7 @@ scd_exit (int rc) static void scd_init_default_ctrl (ctrl_t ctrl) { - ctrl->reader_slot = -1; + (void)ctrl; } static void |