Changeset 3519 for trunk/src

Timestamp:

05/22/08 12:22:23 (8 months ago)

Author:

ludovic.rousseau

Message:

Avoid variable name space collision

reader-pcsc.c:396: warning: declaration of 'priv' shadows a previous local
reader-pcsc.c:367: warning: shadowed declaration is here
reader-pcsc.c:909: warning: declaration of 'reader' shadows a previous local
reader-pcsc.c:901: warning: shadowed declaration is here

Files:

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

trunk/src/libopensc/reader-pcsc.c

@@ -394 +394 @@
         pcsc_ctx = priv->gpriv->pcsc_ctx;
         for (i = 0; i < nslots; i++) {
-                struct pcsc_private_data *priv = GET_PRIV_DATA(readers[i]);
-
-                rgReaderStates[i].szReader = priv->reader_name;
+                struct pcsc_private_data *priv2 = GET_PRIV_DATA(readers[i]);
+
+                rgReaderStates[i].szReader = priv2->reader_name;
                 rgReaderStates[i].dwCurrentState = SCARD_STATE_UNAWARE;
                 rgReaderStates[i].dwEventState = SCARD_STATE_UNAWARE;
 
                 /* Can we handle readers from different PCSC contexts? */
-                if (priv->gpriv->pcsc_ctx != pcsc_ctx)
+                if (priv2->gpriv->pcsc_ctx != pcsc_ctx)
                         return SC_ERROR_INVALID_ARGUMENTS;
         }
@@ -907 +907 @@
 
                 for (i=0;i < sc_ctx_get_reader_count (ctx) && !found;i++) {
-                        sc_reader_t *reader = sc_ctx_get_reader (ctx, i);
-                        if (reader == NULL) {
+                        sc_reader_t *reader2 = sc_ctx_get_reader (ctx, i);
+                        if (reader2 == NULL) {
                                 ret = SC_ERROR_INTERNAL;
                                 goto err1;
                         }
-                        if (reader->ops == &pcsc_ops && !strcmp (reader->name, p)) {
+                        if (reader2->ops == &pcsc_ops && !strcmp (reader2->name, p)) {
                                 found = 1;
                         }