- get rid of warnings when calling load_card_driver_options
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@799 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
a7615abdeb
commit
0980825796
|
@ -294,13 +294,13 @@ static int load_card_drivers(struct sc_context *ctx,
|
||||||
for (drv_count = 0; ctx->card_drivers[drv_count] != NULL; drv_count++);
|
for (drv_count = 0; ctx->card_drivers[drv_count] != NULL; drv_count++);
|
||||||
|
|
||||||
for (i = 0; i < opts->ccount; i++) {
|
for (i = 0; i < opts->ccount; i++) {
|
||||||
const struct sc_card_driver * (* func)(void) = NULL;
|
struct sc_card_driver * (* func)(void) = NULL;
|
||||||
int j;
|
int j;
|
||||||
|
|
||||||
ent = &opts->cdrv[i];
|
ent = &opts->cdrv[i];
|
||||||
for (j = 0; internal_card_drivers[j].name != NULL; j++)
|
for (j = 0; internal_card_drivers[j].name != NULL; j++)
|
||||||
if (strcmp(ent->name, internal_card_drivers[j].name) == 0) {
|
if (strcmp(ent->name, internal_card_drivers[j].name) == 0) {
|
||||||
func = (const struct sc_card_driver * (*)(void)) internal_card_drivers[j].func;
|
func = (struct sc_card_driver * (*)(void)) internal_card_drivers[j].func;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (func == NULL) {
|
if (func == NULL) {
|
||||||
|
@ -419,7 +419,7 @@ int sc_set_card_driver(struct sc_context *ctx, const char *short_name)
|
||||||
ctx->forced_driver = NULL;
|
ctx->forced_driver = NULL;
|
||||||
match = 1;
|
match = 1;
|
||||||
} else while (ctx->card_drivers[i] != NULL && i < SC_MAX_CARD_DRIVERS) {
|
} else while (ctx->card_drivers[i] != NULL && i < SC_MAX_CARD_DRIVERS) {
|
||||||
const struct sc_card_driver *drv = ctx->card_drivers[i];
|
struct sc_card_driver *drv = ctx->card_drivers[i];
|
||||||
|
|
||||||
if (strcmp(short_name, drv->short_name) == 0) {
|
if (strcmp(short_name, drv->short_name) == 0) {
|
||||||
ctx->forced_driver = drv;
|
ctx->forced_driver = drv;
|
||||||
|
|
|
@ -490,8 +490,8 @@ struct sc_context {
|
||||||
struct sc_reader *reader[SC_MAX_READERS];
|
struct sc_reader *reader[SC_MAX_READERS];
|
||||||
int reader_count;
|
int reader_count;
|
||||||
|
|
||||||
const struct sc_card_driver *card_drivers[SC_MAX_CARD_DRIVERS+1];
|
struct sc_card_driver *card_drivers[SC_MAX_CARD_DRIVERS+1];
|
||||||
const struct sc_card_driver *forced_driver;
|
struct sc_card_driver *forced_driver;
|
||||||
|
|
||||||
#ifdef HAVE_PTHREAD
|
#ifdef HAVE_PTHREAD
|
||||||
pthread_mutex_t mutex;
|
pthread_mutex_t mutex;
|
||||||
|
|
Loading…
Reference in New Issue