diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-06-26 16:26:15 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2001-06-26 16:26:15 +0000 |
| commit | 2705cab52d730f5ad0bb7ac46ed74911a86c8e51 (patch) | |
| tree | 5452021bf3d9317a837b202117e1b9eac7167a5f /lib | |
| parent | d15f7390f22a2c0cb3f0398e4120484ecaa94d1e (diff) | |
compile cleanly
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libsectok/sc7816.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/libsectok/sc7816.c b/lib/libsectok/sc7816.c index 021f3ed6c38..4b067a42f22 100644 --- a/lib/libsectok/sc7816.c +++ b/lib/libsectok/sc7816.c @@ -1,4 +1,4 @@ -/* $Id: sc7816.c,v 1.4 2001/06/12 19:35:25 rees Exp $ */ +/* $Id: sc7816.c,v 1.5 2001/06/26 16:26:14 deraadt Exp $ */ /* copyright 2000 @@ -126,7 +126,7 @@ scopen(int ttyn, int flags, int *ep) int scxopen(int ttyn, int flags, int *ep, char *config_path, char *driver_path) { - int i, r = 0; + int r = 0; #ifdef SCPERF SetTime ("scopen() start"); @@ -159,6 +159,8 @@ scxopen(int ttyn, int flags, int *ep, char *config_path, char *driver_path) if (!config_path) config_path = defaultConfigFilePath; if (DBUpdateReaders(config_path, addReader) < 0) { + int i; + if (config_path != defaultConfigFilePath) { /* Something wrong with caller's config file path. */ r = SCEDRVR; @@ -194,7 +196,6 @@ scxopen(int ttyn, int flags, int *ep, char *config_path, char *driver_path) int openReader(int readerNum, int flags) { - void *libHandle; readerInfo *reader; #ifdef DEBUG @@ -207,6 +208,8 @@ openReader(int readerNum, int flags) if (!reader->driverLoaded) { #ifdef DL_READERS + void *libHandle; + if (!reader->driverPath) return SCEDRVR; libHandle = dlopen(reader->driverPath, RTLD_LAZY); |