[Pcsclite-cvs-commit] r4319 - in /trunk/PCSC/src: pcsc-wirecheck-gen.c winscard_clnt.c winscard_msg.h winscard_svc.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Jul 17 14:09:51 2009
New Revision: 4319

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4319
Log:
rename structure fields phCard and phContext into hCard and hContext
since they are not pointers

Modified:
    trunk/PCSC/src/pcsc-wirecheck-gen.c
    trunk/PCSC/src/winscard_clnt.c
    trunk/PCSC/src/winscard_msg.h
    trunk/PCSC/src/winscard_svc.c

Modified: trunk/PCSC/src/pcsc-wirecheck-gen.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcsc-wirecheck-gen.c?rev=4319&op=diff
==============================================================================
--- trunk/PCSC/src/pcsc-wirecheck-gen.c (original)
+++ trunk/PCSC/src/pcsc-wirecheck-gen.c Fri Jul 17 14:09:51 2009
@@ -148,7 +148,7 @@
     BLANK_LINE ();
     CHECK_STRUCT (establish_struct);
     CHECK_MEMBER (establish_struct, dwScope);
-    CHECK_MEMBER (establish_struct, phContext);
+    CHECK_MEMBER (establish_struct, hContext);
     CHECK_MEMBER (establish_struct, rv);
 
     BLANK_LINE ();
@@ -162,7 +162,7 @@
     CHECK_MEMBER (connect_struct, szReader);
     CHECK_MEMBER (connect_struct, dwShareMode);
     CHECK_MEMBER (connect_struct, dwPreferredProtocols);
-    CHECK_MEMBER (connect_struct, phCard);
+    CHECK_MEMBER (connect_struct, hCard);
     CHECK_MEMBER (connect_struct, pdwActiveProtocol);
     CHECK_MEMBER (connect_struct, rv);
 

Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=4319&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Fri Jul 17 14:09:51 2009
@@ -513,7 +513,7 @@
 	 * Try to establish an Application Context with the server
 	 */
 	scEstablishStruct.dwScope = dwScope;
-	scEstablishStruct.phContext = 0;
+	scEstablishStruct.hContext = 0;
 	scEstablishStruct.rv = SCARD_S_SUCCESS;
 
 	rv = WrapSHMWrite(SCARD_ESTABLISH_CONTEXT, dwClientID,
@@ -537,12 +537,12 @@
 		return scEstablishStruct.rv;
 
 	/* check we do not reuse an existing phContext */
-	if (-1 != SCardGetContextIndiceTH(scEstablishStruct.phContext))
+	if (-1 != SCardGetContextIndiceTH(scEstablishStruct.hContext))
 		/* we do not need to release the allocated context since
 		 * SCardReleaseContext() does nothing on the server side */
 		goto again;
 
-	*phContext = scEstablishStruct.phContext;
+	*phContext = scEstablishStruct.hContext;
 
 	/*
 	 * Allocate the new hContext - if allocator full return an error
@@ -784,7 +784,7 @@
 	scConnectStruct.hContext = hContext;
 	scConnectStruct.dwShareMode = dwShareMode;
 	scConnectStruct.dwPreferredProtocols = dwPreferredProtocols;
-	scConnectStruct.phCard = 0;
+	scConnectStruct.hCard = 0;
 	scConnectStruct.pdwActiveProtocol = 0;
 	scConnectStruct.rv = SCARD_S_SUCCESS;
 
@@ -812,7 +812,7 @@
 		return SCARD_F_COMM_ERROR;
 	}
 
-	*phCard = scConnectStruct.phCard;
+	*phCard = scConnectStruct.hCard;
 	*pdwActiveProtocol = scConnectStruct.pdwActiveProtocol;
 
 	if (scConnectStruct.rv == SCARD_S_SUCCESS)

Modified: trunk/PCSC/src/winscard_msg.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg.h?rev=4319&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg.h (original)
+++ trunk/PCSC/src/winscard_msg.h Fri Jul 17 14:09:51 2009
@@ -122,7 +122,7 @@
 	struct establish_struct
 	{
 		uint32_t dwScope;
-		uint32_t phContext;
+		uint32_t hContext;
 		uint32_t rv;
 	};
 	typedef struct establish_struct establish_struct;
@@ -150,7 +150,7 @@
 		char szReader[MAX_READERNAME];
 		uint32_t dwShareMode;
 		uint32_t dwPreferredProtocols;
-		int32_t phCard;
+		int32_t hCard;
 		uint32_t pdwActiveProtocol;
 		uint32_t rv;
 	};

Modified: trunk/PCSC/src/winscard_svc.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_svc.c?rev=4319&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_svc.c (original)
+++ trunk/PCSC/src/winscard_svc.c Fri Jul 17 14:09:51 2009
@@ -295,13 +295,13 @@
 	case SCARD_ESTABLISH_CONTEXT:
 		esStr = ((establish_struct *) msgStruct->data);
 
-		hContext = esStr->phContext;
+		hContext = esStr->hContext;
 		esStr->rv = SCardEstablishContext(esStr->dwScope, 0, 0, &hContext);
-		esStr->phContext = hContext;
+		esStr->hContext = hContext;
 
 		if (esStr->rv == SCARD_S_SUCCESS)
 			esStr->rv =
-				MSGAddContext(esStr->phContext, dwContextIndex);
+				MSGAddContext(esStr->hContext, dwContextIndex);
 		break;
 
 	case SCARD_RELEASE_CONTEXT:
@@ -317,19 +317,19 @@
 	case SCARD_CONNECT:
 		coStr = ((connect_struct *) msgStruct->data);
 
-		hCard = coStr->phCard;
+		hCard = coStr->hCard;
 		dwActiveProtocol = coStr->pdwActiveProtocol;
 
 		coStr->rv = SCardConnect(coStr->hContext, coStr->szReader,
 			coStr->dwShareMode, coStr->dwPreferredProtocols,
 			&hCard, &dwActiveProtocol);
 
-		coStr->phCard = hCard;
+		coStr->hCard = hCard;
 		coStr->pdwActiveProtocol = dwActiveProtocol;
 
 		if (coStr->rv == SCARD_S_SUCCESS)
 			coStr->rv =
-				MSGAddHandle(coStr->hContext, coStr->phCard, dwContextIndex);
+				MSGAddHandle(coStr->hContext, coStr->hCard, dwContextIndex);
 
 		break;