[Pcsclite-cvs-commit] PCSC/src winscard_clnt.c,1.39,1.40

[rousseau@haydn.debian.org]

Update of /cvsroot/pcsclite/PCSC/src
In directory haydn:/tmp/cvs-serv10413/src

Modified Files:
	winscard_clnt.c 
Log Message:
remove the hack introduced in version 1.28. It is no more needed since
the changes in version 1.32 of winscard.c


Index: winscard_clnt.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/winscard_clnt.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- winscard_clnt.c	21 Jun 2004 07:40:26 -0000	1.39
+++ winscard_clnt.c	22 Jun 2004 14:38:14 -0000	1.40
@@ -36,13 +36,6 @@
 #define min(a,b) (((a) < (b)) ? (a) : (b))
 #endif
 
-/*
- * This is hack to allow a change of ATR at Reconnect without physically
- * changing the card. This should not happen in real life so should not be
- * problematic and so is active by default.
- */
-#define ATR_CHANGE_AT_RECONNECT
-
 struct _psChannelMap
 {
 	SCARDHANDLE hCard;
@@ -979,11 +972,7 @@
 	 */
 
 	*pcchReaderLen = strlen(psContextMap[dwContextIndex].psChannelMap[dwChannelIndex].readerName) + 1;
-#ifdef ATR_CHANGE_AT_RECONNECT
-	*pcbAtrLen = scStatusStruct.pcbAtrLen;
-#else
 	*pcbAtrLen = (readerStates[i])->cardAtrLength;
-#endif
 
 	*pdwState = (readerStates[i])->readerState;
 	*pdwProtocol = (readerStates[i])->cardProtocol;
@@ -1004,13 +993,8 @@
 		if (*pcbAtrLen > dwAtrLen)
 			rv = SCARD_E_INSUFFICIENT_BUFFER;
 
-#ifdef ATR_CHANGE_AT_RECONNECT
-		memcpy(pbAtr, scStatusStruct.pbAtr,
-			min(*pcbAtrLen, dwAtrLen));
-#else
 		memcpy(pbAtr, (readerStates[i])->cardAtr,
 			min(*pcbAtrLen, dwAtrLen));
-#endif
 	}
 	
 	SYS_MutexUnLock(psContextMap[dwContextIndex].mMutex);