[Pcsclite-cvs-commit] PCSC/src winscard_svc.c,1.11,1.12

[sauveron-guest@quantz.debian.org]

Update of /cvsroot/pcsclite/PCSC/src
In directory quantz:/tmp/cvs-serv31881/src

Modified Files:
	winscard_svc.c 
Log Message:
Change the name of a structure to better explain its usage

Index: winscard_svc.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_svc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- winscard_svc.c	20 Oct 2003 19:56:36 -0000	1.11
+++ winscard_svc.c	23 Oct 2003 21:27:47 -0000	1.12
@@ -22,14 +22,14 @@
 #include "debuglog.h"
 #include "sys_generic.h"
 
-static struct _psChannelMap
+static struct _psChannelContext
 {
 	SCARDCONTEXT hContext;
 	SCARDHANDLE hCard[PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS];
 	DWORD dwClientID;
 	DWORD dwHandleID;
 }
-psChannelMap[PCSCLITE_MAX_APPLICATIONS_CONTEXTS];
+psChannelContext[PCSCLITE_MAX_APPLICATIONS_CONTEXTS];
 
 LONG MSGCheckHandleAssociation(DWORD, SCARDHANDLE);
 
@@ -171,10 +171,10 @@
 
 	for (i = 0; i < PCSCLITE_MAX_APPLICATIONS_CONTEXTS; i++)
 	{
-		if (psChannelMap[i].dwClientID == 0)
+		if (psChannelContext[i].dwClientID == 0)
 		{
-			psChannelMap[i].hContext = hContext;
-			psChannelMap[i].dwClientID = dwClientID;
+			psChannelContext[i].hContext = hContext;
+			psChannelContext[i].dwClientID = dwClientID;
 			break;
 		}
 	}
@@ -197,8 +197,8 @@
 
 	for (i = 0; i < PCSCLITE_MAX_APPLICATIONS_CONTEXTS; i++)
 	{
-		if (psChannelMap[i].hContext == hContext &&
-			psChannelMap[i].dwClientID == dwClientID)
+		if (psChannelContext[i].hContext == hContext &&
+			psChannelContext[i].dwClientID == dwClientID)
 		{
 
 			for (j = 0; j < PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS; j++)
@@ -207,7 +207,7 @@
 				 * Disconnect each of these just in case 
 				 */
 
-				if (psChannelMap[i].hCard[j] != 0)
+				if (psChannelContext[i].hCard[j] != 0)
 				{
 
 					/*
@@ -216,27 +216,27 @@
 					 * Disconnect is called 
 					 */
 
-					rv = SCardStatus(psChannelMap[i].hCard[j], 0, 0, 0, 0,
+					rv = SCardStatus(psChannelContext[i].hCard[j], 0, 0, 0, 0,
 						0, 0);
 
 					if (rv == SCARD_W_RESET_CARD
 						|| rv == SCARD_W_REMOVED_CARD)
 					{
-						SCardDisconnect(psChannelMap[i].hCard[j],
+						SCardDisconnect(psChannelContext[i].hCard[j],
 							SCARD_LEAVE_CARD);
 					} else
 					{
-						SCardDisconnect(psChannelMap[i].hCard[j],
+						SCardDisconnect(psChannelContext[i].hCard[j],
 							SCARD_RESET_CARD);
 					}
 
-					psChannelMap[i].hCard[j] = 0;
+					psChannelContext[i].hCard[j] = 0;
 				}
 
 			}
 
-			psChannelMap[i].hContext = 0;
-			psChannelMap[i].dwClientID = 0;
+			psChannelContext[i].hContext = 0;
+			psChannelContext[i].dwClientID = 0;
 			SCardReleaseContext(hContext);
 			return SCARD_S_SUCCESS;
 		}
@@ -253,8 +253,8 @@
 
 	for (i = 0; i < PCSCLITE_MAX_APPLICATIONS_CONTEXTS; i++)
 	{
-		if (psChannelMap[i].hContext == hContext &&
-			psChannelMap[i].dwClientID == dwClientID)
+		if (psChannelContext[i].hContext == hContext &&
+			psChannelContext[i].dwClientID == dwClientID)
 		{
 
 			/*
@@ -262,9 +262,9 @@
 			 */
 			for (j = 0; j < PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS; j++)
 			{
-				if (psChannelMap[i].hCard[j] == 0)
+				if (psChannelContext[i].hCard[j] == 0)
 				{
-					psChannelMap[i].hCard[j] = hCard;
+					psChannelContext[i].hCard[j] = hCard;
 					break;
 				}
 			}
@@ -298,15 +298,15 @@
 		 * when SCardDisconnect is called.
 		 * Perhaps a modification to do in the future. (D. Sauveron)
 		 */
-		/* if (psChannelMap[i].hContext == hContext && */
-		/* 	psChannelMap[i].dwClientID == dwClientID) */
-		if (psChannelMap[i].dwClientID == dwClientID)
+		/* if (psChannelContext[i].hContext == hContext && */
+		/* 	psChannelContext[i].dwClientID == dwClientID) */
+		if (psChannelContext[i].dwClientID == dwClientID)
 		{
 			for (j = 0; j < PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS; j++)
 			{
-				if (psChannelMap[i].hCard[j] == hCard)
+				if (psChannelContext[i].hCard[j] == hCard)
 				{
-					psChannelMap[i].hCard[j] = 0;
+					psChannelContext[i].hCard[j] = 0;
 					return SCARD_S_SUCCESS;
 				}
 			}
@@ -324,11 +324,11 @@
 
 	for (i = 0; i < PCSCLITE_MAX_APPLICATIONS_CONTEXTS; i++)
 	{
-		if (psChannelMap[i].dwClientID == dwClientID)
+		if (psChannelContext[i].dwClientID == dwClientID)
 		{
 			for (j = 0; j < PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS; j++)
 			{
-				if (psChannelMap[i].hCard[j] == hCard)
+				if (psChannelContext[i].hCard[j] == hCard)
 				{
 				  return 0;
 				}
@@ -350,9 +350,9 @@
 
 	for (i = 0; i < PCSCLITE_MAX_APPLICATIONS_CONTEXTS; i++)
 	{
-		if (psChannelMap[i].dwClientID == msgStruct->request_id)
+		if (psChannelContext[i].dwClientID == msgStruct->request_id)
 		{
-			MSGRemoveContext(psChannelMap[i].hContext,
+			MSGRemoveContext(psChannelContext[i].hContext,
 				msgStruct->request_id);
 		}
 	}