From 38ba3ad18d0b6dbe33c7e98bbefcdb2eb3c6bb7f Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 13 Nov 2009 11:32:12 +0000 Subject: [PATCH] Remove card->finish() functions that do nothing git-svn-id: https://www.opensc-project.org/svnp/opensc/branches/martin/0.12@3839 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/libopensc/card-acos5.c | 6 ------ src/libopensc/card-asepcos.c | 6 ------ src/libopensc/card-cardos.c | 6 ------ src/libopensc/card-default.c | 6 ------ src/libopensc/card-ias.c | 6 ------ src/libopensc/card-incrypto34.c | 6 ------ src/libopensc/card-miocos.c | 6 ------ src/libopensc/card-myeid.c | 7 ------- src/libopensc/card-rtecp.c | 1 - src/libopensc/card-setcos.c | 6 ------ 10 files changed, 56 deletions(-) diff --git a/src/libopensc/card-acos5.c b/src/libopensc/card-acos5.c index 8e239187..ccea424e 100644 --- a/src/libopensc/card-acos5.c +++ b/src/libopensc/card-acos5.c @@ -54,11 +54,6 @@ static int acos5_init(sc_card_t * card) return SC_SUCCESS; } -static int acos5_finish(sc_card_t * card) -{ - return SC_SUCCESS; -} - static int acos5_select_file_by_path(sc_card_t * card, const sc_path_t * in_path, sc_file_t ** file_out) @@ -225,7 +220,6 @@ static struct sc_card_driver *sc_get_driver(void) acos5_ops.match_card = acos5_match_card; acos5_ops.init = acos5_init; - acos5_ops.finish = acos5_finish; acos5_ops.select_file = acos5_select_file; acos5_ops.card_ctl = acos5_card_ctl; acos5_ops.list_files = acos5_list_files; diff --git a/src/libopensc/card-asepcos.c b/src/libopensc/card-asepcos.c index 317639f1..4cfe4b3a 100644 --- a/src/libopensc/card-asepcos.c +++ b/src/libopensc/card-asepcos.c @@ -39,11 +39,6 @@ static struct sc_atr_table asepcos_atrs[] = { { NULL, NULL, NULL, 0, 0, NULL } }; -static int asepcos_finish(sc_card_t *card) -{ - return SC_SUCCESS; -} - static int asepcos_match_card(sc_card_t *card) { int i = _sc_match_atr(card, asepcos_atrs, &card->type); @@ -1098,7 +1093,6 @@ static struct sc_card_driver * sc_get_driver(void) asepcos_ops = *iso_ops; asepcos_ops.match_card = asepcos_match_card; asepcos_ops.init = asepcos_init; - asepcos_ops.finish = asepcos_finish; asepcos_ops.select_file = asepcos_select_file; asepcos_ops.set_security_env = asepcos_set_security_env; asepcos_ops.decipher = asepcos_decipher; diff --git a/src/libopensc/card-cardos.c b/src/libopensc/card-cardos.c index 1ca70753..506a66ed 100644 --- a/src/libopensc/card-cardos.c +++ b/src/libopensc/card-cardos.c @@ -53,11 +53,6 @@ static struct sc_atr_table cardos_atrs[] = { { NULL, NULL, NULL, 0, 0, NULL } }; -static int cardos_finish(sc_card_t *card) -{ - return 0; -} - static int cardos_match_card(sc_card_t *card) { int i; @@ -1178,7 +1173,6 @@ static struct sc_card_driver * sc_get_driver(void) cardos_ops = *iso_ops; cardos_ops.match_card = cardos_match_card; cardos_ops.init = cardos_init; - cardos_ops.finish = cardos_finish; cardos_ops.select_file = cardos_select_file; cardos_ops.create_file = cardos_create_file; cardos_ops.set_security_env = cardos_set_security_env; diff --git a/src/libopensc/card-default.c b/src/libopensc/card-default.c index 70e5c26c..2408b0ef 100644 --- a/src/libopensc/card-default.c +++ b/src/libopensc/card-default.c @@ -29,11 +29,6 @@ static struct sc_card_driver default_drv = { NULL, 0, NULL }; -static int default_finish(sc_card_t *card) -{ - return SC_SUCCESS; -} - static int default_match_card(sc_card_t *card) { return 1; /* always match */ @@ -124,7 +119,6 @@ static struct sc_card_driver * sc_get_driver(void) default_ops = *iso_drv->ops; default_ops.match_card = default_match_card; default_ops.init = default_init; - default_ops.finish = default_finish; return &default_drv; } diff --git a/src/libopensc/card-ias.c b/src/libopensc/card-ias.c index 2fadbe57..476ceaf3 100644 --- a/src/libopensc/card-ias.c +++ b/src/libopensc/card-ias.c @@ -106,11 +106,6 @@ static int ias_init(sc_card_t *card) return SC_SUCCESS; } -static int ias_finish(sc_card_t *card) -{ - return SC_SUCCESS; -} - static int ias_match_card(sc_card_t *card) { int i; @@ -535,7 +530,6 @@ static struct sc_card_driver *sc_get_driver(void) ias_ops.select_file = ias_select_file; ias_ops.match_card = ias_match_card; ias_ops.init = ias_init; - ias_ops.finish = ias_finish; ias_ops.set_security_env = ias_set_security_env; ias_ops.compute_signature = ias_compute_signature; ias_ops.pin_cmd = ias_pin_cmd; diff --git a/src/libopensc/card-incrypto34.c b/src/libopensc/card-incrypto34.c index 15685d03..c8c8a65e 100644 --- a/src/libopensc/card-incrypto34.c +++ b/src/libopensc/card-incrypto34.c @@ -49,11 +49,6 @@ static struct sc_atr_table incrypto34_atrs[] = { { NULL, NULL, NULL, 0, 0, NULL } }; -static int incrypto34_finish(struct sc_card *card) -{ - return 0; -} - static int incrypto34_match_card(struct sc_card *card) { int i; @@ -909,7 +904,6 @@ static struct sc_card_driver * sc_get_driver(void) incrypto34_ops = *iso_ops; incrypto34_ops.match_card = incrypto34_match_card; incrypto34_ops.init = incrypto34_init; - incrypto34_ops.finish = incrypto34_finish; incrypto34_ops.select_file = incrypto34_select_file; incrypto34_ops.create_file = incrypto34_create_file; incrypto34_ops.set_security_env = incrypto34_set_security_env; diff --git a/src/libopensc/card-miocos.c b/src/libopensc/card-miocos.c index cb4050be..351308ff 100644 --- a/src/libopensc/card-miocos.c +++ b/src/libopensc/card-miocos.c @@ -40,11 +40,6 @@ static struct sc_card_driver miocos_drv = { NULL, 0, NULL }; -static int miocos_finish(sc_card_t *card) -{ - return 0; -} - static int miocos_match_card(sc_card_t *card) { int i; @@ -488,7 +483,6 @@ static struct sc_card_driver * sc_get_driver(void) miocos_ops = *iso_drv->ops; miocos_ops.match_card = miocos_match_card; miocos_ops.init = miocos_init; - miocos_ops.finish = miocos_finish; if (iso_ops == NULL) iso_ops = iso_drv->ops; miocos_ops.create_file = miocos_create_file; diff --git a/src/libopensc/card-myeid.c b/src/libopensc/card-myeid.c index 26459a42..0799efb3 100644 --- a/src/libopensc/card-myeid.c +++ b/src/libopensc/card-myeid.c @@ -46,12 +46,6 @@ static const char *myeid_atrs[] = { NULL }; - -static int myeid_finish(struct sc_card *card) -{ - return 0; -} - static int myeid_match_card(struct sc_card *card) { int i, match = -1; @@ -1037,7 +1031,6 @@ static struct sc_card_driver * sc_get_driver(void) myeid_ops = *iso_drv->ops; myeid_ops.match_card = myeid_match_card; myeid_ops.init = myeid_init; - myeid_ops.finish = myeid_finish; if (iso_ops == NULL) iso_ops = iso_drv->ops; myeid_ops.read_binary = myeid_read_binary; diff --git a/src/libopensc/card-rtecp.c b/src/libopensc/card-rtecp.c index 402c7a82..877bc2bd 100644 --- a/src/libopensc/card-rtecp.c +++ b/src/libopensc/card-rtecp.c @@ -785,7 +785,6 @@ struct sc_card_driver * sc_get_rtecp_driver(void) rtecp_ops.match_card = rtecp_match_card; rtecp_ops.init = rtecp_init; - rtecp_ops.finish = NULL; /* read_binary */ rtecp_ops.write_binary = NULL; /* update_binary */ diff --git a/src/libopensc/card-setcos.c b/src/libopensc/card-setcos.c index b0ad094e..a17ea5ec 100644 --- a/src/libopensc/card-setcos.c +++ b/src/libopensc/card-setcos.c @@ -70,11 +70,6 @@ static struct sc_card_driver setcos_drv = { NULL, 0, NULL }; -static int setcos_finish(sc_card_t *card) -{ - return 0; -} - static int match_hist_bytes(sc_card_t *card, const char *str, size_t len) { const char *src = (const char *) card->slot->atr_info.hist_bytes; @@ -1120,7 +1115,6 @@ static struct sc_card_driver *sc_get_driver(void) setcos_ops = *iso_drv->ops; setcos_ops.match_card = setcos_match_card; setcos_ops.init = setcos_init; - setcos_ops.finish = setcos_finish; if (iso_ops == NULL) iso_ops = iso_drv->ops; setcos_ops.create_file = setcos_create_file;