[Pcsclite-cvs-commit] CVS PCSC/src

[CVS User rousseau]

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

Modified Files:
	winscard.c ifdwrapper.c 
Log Message:
add "Card not transacted" error messages. Thanks to Bruce Barnett for
the patch.


--- /cvsroot/pcsclite/PCSC/src/winscard.c	2004/09/03 19:49:42	1.45
+++ /cvsroot/pcsclite/PCSC/src/winscard.c	2004/09/14 22:51:17	1.46
@@ -8,7 +8,7 @@
  *  David Corcoran <corcoran@linuxnet.com>
  *  Ludovic Rousseau <ludovic.rousseau@free.fr>
  *
- * $Id: winscard.c,v 1.45 2004/09/03 19:49:42 rousseau Exp $
+ * $Id: winscard.c,v 1.46 2004/09/14 22:51:17 rousseau Exp $
  */
 
 #include "config.h"
@@ -1395,6 +1395,7 @@
 	if (rv != SCARD_S_SUCCESS)
 	{
 		*pcbRecvLength = 0;
+		DebugLogB("Card not transacted: %ld", rv);
 		return SCARD_E_NOT_TRANSACTED;
 	}
 
--- /cvsroot/pcsclite/PCSC/src/ifdwrapper.c	2004/08/16 15:13:58	1.27
+++ /cvsroot/pcsclite/PCSC/src/ifdwrapper.c	2004/09/14 22:51:17	1.28
@@ -8,7 +8,7 @@
  *  Damien Sauveron <damien.sauveron@labri.fr>
  *  Ludovic Rousseau <ludovic.rousseau@free.fr>
  *
- * $Id: ifdwrapper.c,v 1.27 2004/08/16 15:13:58 rousseau Exp $
+ * $Id: ifdwrapper.c,v 1.28 2004/09/14 22:51:17 rousseau Exp $
  */
 
 #include "config.h"
@@ -476,7 +476,10 @@
 		if (rv == IFD_ICC_NOT_PRESENT)
 			dwCardStatus |= SCARD_ABSENT;
 		else
+		{
+			DebugLogB("Card not transacted: %ld", rv);
 			return SCARD_E_NOT_TRANSACTED;
+		}
 
 	/*
 	 * Now lets get the ATR and process it if IFD Handler version 1.0.
@@ -588,7 +591,10 @@
 	if (rv == IFD_SUCCESS)
 		return SCARD_S_SUCCESS;
 	else
+	{
+		DebugLogB("Card not transacted: %ld", rv);
 		return SCARD_E_NOT_TRANSACTED;
+	}
 }
 
 /*
@@ -640,7 +646,10 @@
 	if (rv == IFD_SUCCESS)
 		return SCARD_S_SUCCESS;
 	else
+	{
+		DebugLogB("Card not transacted: %ld", rv);
 		return SCARD_E_NOT_TRANSACTED;
+	}
 }
 
 /*
@@ -718,6 +727,9 @@
 	if (rv == IFD_SUCCESS)
 		return SCARD_S_SUCCESS;
 	else
+	{
+		DebugLogB("Card not transacted: %ld", rv);
 		return SCARD_E_NOT_TRANSACTED;
+	}
 }