Changeset 3455 for trunk/src/libopensc/reader-pcsc.c

Timestamp:

04/02/08 05:44:12 (9 months ago)

Author:

alonbl

Message:

Rename PC/SC library into PC/SC provider.
Sync symbols between configuration and source.
Put default provider in opensc.conf, opensc-tool.

Files:

• trunk/src/libopensc/reader-pcsc.c (modified) (3 diffs)

trunk/src/libopensc/reader-pcsc.c

@@ -68 +68 @@
         int connect_reset;
         int transaction_reset;
-        const char *library_name;
+        const char *provider_library;
         lt_dlhandle dlhandle;
         SCardEstablishContext_t SCardEstablishContext;
@@ -753 +753 @@
         gpriv->transaction_reset = 0;
         gpriv->enable_pinpad = 0;
-        gpriv->library_name = PCSC_DEFAULT_LIBRARY_NAME;
+        gpriv->provider_library = DEFAULT_PCSC_PROVIDER;
         
         conf_block = sc_get_conf_block(ctx, "reader_driver", "pcsc", 1);
@@ -765 +765 @@
                 gpriv->enable_pinpad =
                     scconf_get_bool(conf_block, "enable_pinpad", gpriv->enable_pinpad);
-                gpriv->library_name =
-                    scconf_get_str(conf_block, "library_name", gpriv->library_name);
-        }
-
-        gpriv->dlhandle = lt_dlopen(gpriv->library_name);
+                gpriv->provider_library =
+                    scconf_get_str(conf_block, "provider_library", gpriv->provider_library);
+        }
+
+        gpriv->dlhandle = lt_dlopen(gpriv->provider_library);
         if (gpriv->dlhandle == NULL) {
                 ret = SC_ERROR_CANNOT_LOAD_MODULE;