[Pcsclite-cvs-commit] PCSC/src winscard_svc.c,1.9,1.10

[sauveron-guest@quantz.debian.org]

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

Modified Files:
	winscard_svc.c 
Log Message:
Correct with the goods concepts constants

Index: winscard_svc.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_svc.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- winscard_svc.c	18 Oct 2003 17:19:36 -0000	1.9
+++ winscard_svc.c	20 Oct 2003 16:15:13 -0000	1.10
@@ -25,11 +25,11 @@
 static struct _psChannelMap
 {
 	SCARDCONTEXT hContext;
-	SCARDHANDLE hCard[PCSCLITE_MAX_CONTEXTS];
+	SCARDHANDLE hCard[PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS];
 	DWORD dwClientID;
 	DWORD dwHandleID;
 }
-psChannelMap[PCSCLITE_MAX_CHANNELS];
+psChannelMap[PCSCLITE_MAX_APPLICATIONS_CONTEXTS];
 
 LONG MSGCheckHandleAssociation(DWORD, SCARDHANDLE);
 
@@ -170,7 +170,7 @@
 
 	int i;
 
-	for (i = 0; i < PCSCLITE_MAX_CHANNELS; i++)
+	for (i = 0; i < PCSCLITE_MAX_APPLICATIONS_CONTEXTS; i++)
 	{
 		if (psChannelMap[i].dwClientID == 0)
 		{
@@ -180,7 +180,7 @@
 		}
 	}
 
-	if (i == PCSCLITE_MAX_CHANNELS)
+	if (i == PCSCLITE_MAX_APPLICATIONS_CONTEXTS)
 	{
 		return SCARD_F_INTERNAL_ERROR;
 	} else
@@ -196,13 +196,13 @@
 	int i, j;
 	LONG rv;
 
-	for (i = 0; i < PCSCLITE_MAX_CHANNELS; i++)
+	for (i = 0; i < PCSCLITE_MAX_APPLICATIONS_CONTEXTS; i++)
 	{
 		if (psChannelMap[i].hContext == hContext &&
 			psChannelMap[i].dwClientID == dwClientID)
 		{
 
-			for (j = 0; j < PCSCLITE_MAX_CONTEXTS; j++)
+			for (j = 0; j < PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS; j++)
 			{
 				/*
 				 * Disconnect each of these just in case 
@@ -252,7 +252,7 @@
 
 	int i, j;
 
-	for (i = 0; i < PCSCLITE_MAX_CHANNELS; i++)
+	for (i = 0; i < PCSCLITE_MAX_APPLICATIONS_CONTEXTS; i++)
 	{
 		if (psChannelMap[i].hContext == hContext &&
 			psChannelMap[i].dwClientID == dwClientID)
@@ -261,7 +261,7 @@
 			/*
 			 * Find an empty spot to put the hCard value 
 			 */
-			for (j = 0; j < PCSCLITE_MAX_CONTEXTS; j++)
+			for (j = 0; j < PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS; j++)
 			{
 				if (psChannelMap[i].hCard[j] == 0)
 				{
@@ -270,7 +270,7 @@
 				}
 			}
 
-			if (j == PCSCLITE_MAX_CONTEXTS)
+			if (j == PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS)
 			{
 				return SCARD_F_INTERNAL_ERROR;
 			} else
@@ -292,12 +292,12 @@
 
 	int i, j;
 
-	for (i = 0; i < PCSCLITE_MAX_CHANNELS; i++)
+	for (i = 0; i < PCSCLITE_MAX_APPLICATIONS_CONTEXTS; i++)
 	{
 		if (psChannelMap[i].hContext == hContext &&
 			psChannelMap[i].dwClientID == dwClientID)
 		{
-			for (j = 0; j < PCSCLITE_MAX_CONTEXTS; j++)
+			for (j = 0; j < PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS; j++)
 			{
 				if (psChannelMap[i].hCard[j] == hCard)
 				{
@@ -317,11 +317,11 @@
 
 	int i, j;
 
-	for (i = 0; i < PCSCLITE_MAX_CHANNELS; i++)
+	for (i = 0; i < PCSCLITE_MAX_APPLICATIONS_CONTEXTS; i++)
 	{
 		if (psChannelMap[i].dwClientID == dwClientID)
 		{
-			for (j = 0; j < PCSCLITE_MAX_CONTEXTS; j++)
+			for (j = 0; j < PCSCLITE_MAX_APPLICATION_CONTEXT_CHANNELS; j++)
 			{
 				if (psChannelMap[i].hCard[j] == hCard)
 				{
@@ -343,7 +343,7 @@
 
 	int i;
 
-	for (i = 0; i < PCSCLITE_MAX_CHANNELS; i++)
+	for (i = 0; i < PCSCLITE_MAX_APPLICATIONS_CONTEXTS; i++)
 	{
 		if (psChannelMap[i].dwClientID == msgStruct->request_id)
 		{