From 7e6b7cd4f6efc183bd6dcc1e8e0eb74a317d7c07 Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgner@informatik.hu-berlin.de>
Date: Wed, 7 Aug 2013 21:43:44 +0200
Subject: [PATCH] avoid error: variable modified at file scope

---
 virtualsmartcard/src/libpcsclite/winscard.c |  6 +++---
 virtualsmartcard/src/vpcd/ifd-vpcd.c        | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/virtualsmartcard/src/libpcsclite/winscard.c b/virtualsmartcard/src/libpcsclite/winscard.c
index 78e6a2f..17f39d1 100644
--- a/virtualsmartcard/src/libpcsclite/winscard.c
+++ b/virtualsmartcard/src/libpcsclite/winscard.c
@@ -44,7 +44,7 @@ static const char reader_format_str[] = "Virtual PCD %02"SCNu32;
 static const SCARDHANDLE validhandle = 1;
 
 /* part of libvpcd, but not exported */
-extern const unsigned char VICC_MAX_SLOTS;
+extern const unsigned char vicc_max_slots;
 extern const char *hostname;
 
 static LONG autoallocate(void *buf, LPDWORD len, DWORD max, void **rbuf)
@@ -80,7 +80,7 @@ static void initialize_globals(void)
 
     hostname = VPCDHOST;
     for (Lun = 0;
-            Lun < PCSCLITE_MAX_READERS_CONTEXTS && Lun < VICC_MAX_SLOTS;
+            Lun < PCSCLITE_MAX_READERS_CONTEXTS && Lun < vicc_max_slots;
             Lun++) {
         IFDHCreateChannel (Lun, Channel);
     }
@@ -91,7 +91,7 @@ static void release_globals(void)
 {
     DWORD Lun;
     for (Lun = 0;
-            Lun < PCSCLITE_MAX_READERS_CONTEXTS && Lun < VICC_MAX_SLOTS;
+            Lun < PCSCLITE_MAX_READERS_CONTEXTS && Lun < vicc_max_slots;
             Lun++) {
         IFDHCloseChannel (Lun);
     }
diff --git a/virtualsmartcard/src/vpcd/ifd-vpcd.c b/virtualsmartcard/src/vpcd/ifd-vpcd.c
index 5ec28fc..8b6e618 100644
--- a/virtualsmartcard/src/vpcd/ifd-vpcd.c
+++ b/virtualsmartcard/src/vpcd/ifd-vpcd.c
@@ -27,9 +27,10 @@
 
 /* pcscd allows at most 16 readers. We will use 10.
  * See PCSCLITE_MAX_READERS_CONTEXTS in pcsclite.h */
-const unsigned char VICC_MAX_SLOTS =
-        PCSCLITE_MAX_READERS_CONTEXTS > 6 ?
-        PCSCLITE_MAX_READERS_CONTEXTS-6 : 1;
+#define VICC_MAX_SLOTS \
+        PCSCLITE_MAX_READERS_CONTEXTS > 6 ? \
+        PCSCLITE_MAX_READERS_CONTEXTS-6 : 1
+const unsigned char vicc_max_slots = VICC_MAX_SLOTS;
 
 static struct vicc_ctx *ctx[VICC_MAX_SLOTS];
 const char *hostname = NULL;
@@ -39,7 +40,7 @@ RESPONSECODE
 IFDHCreateChannel (DWORD Lun, DWORD Channel)
 {
     size_t slot = Lun & 0xffff;
-    if (slot >= VICC_MAX_SLOTS) {
+    if (slot >= vicc_max_slots) {
         return IFD_COMMUNICATION_ERROR;
     }
     if (!hostname)
@@ -123,7 +124,7 @@ RESPONSECODE
 IFDHCloseChannel (DWORD Lun)
 {
     size_t slot = Lun & 0xffff;
-    if (slot >= VICC_MAX_SLOTS) {
+    if (slot >= vicc_max_slots) {
         return IFD_COMMUNICATION_ERROR;
     }
     if (vicc_exit(ctx[slot]) < 0) {
@@ -141,7 +142,7 @@ IFDHGetCapabilities (DWORD Lun, DWORD Tag, PDWORD Length, PUCHAR Value)
     unsigned char *atr = NULL;
     ssize_t size;
     size_t slot = Lun & 0xffff;
-    if (slot >= VICC_MAX_SLOTS) {
+    if (slot >= vicc_max_slots) {
         return IFD_COMMUNICATION_ERROR;
     }
 
@@ -179,7 +180,7 @@ IFDHGetCapabilities (DWORD Lun, DWORD Tag, PDWORD Length, PUCHAR Value)
                 return IFD_COMMUNICATION_ERROR;
             }
 
-            *Value  = VICC_MAX_SLOTS;
+            *Value  = vicc_max_slots;
             *Length = 1;
             break;
 
@@ -221,7 +222,7 @@ RESPONSECODE
 IFDHPowerICC (DWORD Lun, DWORD Action, PUCHAR Atr, PDWORD AtrLength)
 {
     size_t slot = Lun & 0xffff;
-    if (slot >= VICC_MAX_SLOTS) {
+    if (slot >= vicc_max_slots) {
         return IFD_COMMUNICATION_ERROR;
     }
     switch (Action) {
@@ -266,7 +267,7 @@ IFDHTransmitToICC (DWORD Lun, SCARD_IO_HEADER SendPci, PUCHAR TxBuffer,
     ssize_t size;
     RESPONSECODE r = IFD_COMMUNICATION_ERROR;
     size_t slot = Lun & 0xffff;
-    if (slot >= VICC_MAX_SLOTS) {
+    if (slot >= vicc_max_slots) {
         return IFD_COMMUNICATION_ERROR;
     }
 
@@ -306,7 +307,7 @@ RESPONSECODE
 IFDHICCPresence (DWORD Lun)
 {
     size_t slot = Lun & 0xffff;
-    if (slot >= VICC_MAX_SLOTS) {
+    if (slot >= vicc_max_slots) {
         return IFD_COMMUNICATION_ERROR;
     }
     switch (vicc_present(ctx[slot])) {