[Pcsclite-cvs-commit] PCSC/src testpcsc.c,1.8,1.9

rousseau@haydn.debian.org rousseau@haydn.debian.org


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

Modified Files:
	testpcsc.c 
Log Message:
do not SCardReleaseContext() in case of error in SCardControl test


Index: testpcsc.c
===================================================================
RCS file: /cvsroot/pcsclite/PCSC/src/testpcsc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- testpcsc.c	16 Apr 2004 15:24:54 -0000	1.8
+++ testpcsc.c	16 Apr 2004 16:11:15 -0000	1.9
@@ -180,38 +180,24 @@
 		return -1;
 	}
 
+	printf("Testing SCardControl             : ");
 #ifdef PCSC_PRE_120
 	{
 		char buffer[1024] = "Foobar";
 		DWORD cbRecvLength = sizeof(buffer);
 
-		printf("Testing SCardControl             : ");
-		
 		rv = SCardControl(hCard, buffer, 7, buffer, &cbRecvLength);
-
-		printf("%s\n", pcsc_stringify_error(rv));
-
-		/* may fail if not supported by the driver */
-		if (rv != SCARD_S_SUCCESS)
-			SCardReleaseContext(hContext);
 	}
 #else
 	{
 		char buffer[1024] = "Foobar";
 		DWORD cbRecvLength = sizeof(buffer);
 
-		printf("Testing SCardControl             : ");
-		
 		rv = SCardControl(hCard, 0x42000001, buffer, 7, buffer, sizeof(buffer),
 			&cbRecvLength);
-
-		printf("%s\n", pcsc_stringify_error(rv));
-
-		/* may fail if not supported by the driver */
-		if (rv != SCARD_S_SUCCESS)
-			SCardReleaseContext(hContext);
 	}
 #endif
+	printf("%s\n", pcsc_stringify_error(rv));
 
 	printf("Testing SCardStatus              : ");