CVS: rdesktop scard.c,1.15,1.16

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27132

Modified Files:
	scard.c 
Log Message:
add human readable error messages


Index: scard.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** scard.c	4 Nov 2006 17:33:15 -0000	1.15
--- scard.c	4 Nov 2006 20:02:42 -0000	1.16
***************
*** 607,612 ****
  	if (rv)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardEstablishContext Code=0x%.8x]-->\n",
! 			     (unsigned int) rv));
  	}
  	else
--- 607,612 ----
  	if (rv)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardEstablishContext Code=0x%.8x, %s]-->\n",
! 			     (unsigned int) rv, pcsc_stringify_error(rv)));
  	}
  	else
***************
*** 637,641 ****
  	if (rv)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardReleaseContext Code=0x%.8x-->\n", (unsigned int) rv));
  	}
  	else
--- 637,642 ----
  	if (rv)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardReleaseContext Code=0x%.8x, %s-->\n", (unsigned int) rv,
! 			     pcsc_stringify_error(rv)));
  	}
  	else
***************
*** 670,675 ****
  	if (rv)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardListReaders (no SCardIsValidContext) Code=0x%.8x-->\n",
! 			     (unsigned int) rv));
  		rv = SCARD_E_INVALID_HANDLE;
  	}
--- 671,675 ----
  	if (rv)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardListReaders (no SCardIsValidContext) Code=0x%.8x, %s-->\n", (unsigned int) rv, pcsc_stringify_error(rv)));
  		rv = SCARD_E_INVALID_HANDLE;
  	}
***************
*** 789,793 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardConnect Code=0x%.8x-->\n", (unsigned int) rv));
  	}
  	else
--- 789,794 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardConnect Code=0x%.8x, %s-->\n", (unsigned int) rv,
! 			     pcsc_stringify_error(rv)));
  	}
  	else
***************
*** 863,867 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardReconnect Code=0x%.8x-->\n", (unsigned int) rv));
  	}
  	else
--- 864,869 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardReconnect Code=0x%.8x, %s-->\n", (unsigned int) rv,
! 			     pcsc_stringify_error(rv)));
  	}
  	else
***************
*** 919,923 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardDisconnect Code=0x%.8x-->\n", (unsigned int) rv));
  	}
  	else
--- 921,926 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardDisconnect Code=0x%.8x, %s-->\n", (unsigned int) rv,
! 			     pcsc_stringify_error(rv)));
  	}
  	else
***************
*** 1131,1135 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardGetStatusChange Code=0x%.8x-->\n", (unsigned int) rv));
  	}
  	else
--- 1134,1139 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardGetStatusChange Code=0x%.8x, %s-->\n",
! 			     (unsigned int) rv, pcsc_stringify_error(rv)));
  	}
  	else
***************
*** 1201,1205 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardCancel Code=0x%.8x-->\n", (unsigned int) rv));
  	}
  	else
--- 1205,1210 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardCancel Code=0x%.8x, %s-->\n", (unsigned int) rv,
! 			     pcsc_stringify_error(rv)));
  	}
  	else
***************
*** 1270,1274 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardGetStatusChange (no SCardLocateCardsByATR) Code=0x%.8x-->\n", (unsigned int) rv));
  	}
  	else
--- 1275,1279 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardGetStatusChange (no SCardLocateCardsByATR) Code=0x%.8x, %s-->\n", (unsigned int) rv, pcsc_stringify_error(rv)));
  	}
  	else
***************
*** 1332,1336 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardBeginTransaction Code=0x%.8x-->\n", (unsigned int) rv));
  	}
  	else
--- 1337,1342 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardBeginTransaction Code=0x%.8x, %s-->\n",
! 			     (unsigned int) rv, pcsc_stringify_error(rv)));
  	}
  	else
***************
*** 1363,1367 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardEndTransaction Code=0x%.8x-->\n", (unsigned int) rv));
  	}
  	else
--- 1369,1374 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardEndTransaction Code=0x%.8x, %s-->\n", (unsigned int) rv,
! 			     pcsc_stringify_error(rv)));
  	}
  	else
***************
*** 1572,1576 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardTransmit Code=0x%.8x-->\n", (unsigned int) rv));
  	}
  	else
--- 1579,1584 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardTransmit Code=0x%.8x, %s-->\n", (unsigned int) rv,
! 			     pcsc_stringify_error(rv)));
  	}
  	else
***************
*** 1669,1673 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardStatus Code=0x%.8x-->\n", (unsigned int) rv));
  		return SC_returnCode(rv, &lcHandle, in, out);
  	}
--- 1677,1682 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardStatus Code=0x%.8x, %s-->\n", (unsigned int) rv,
! 			     pcsc_stringify_error(rv)));
  		return SC_returnCode(rv, &lcHandle, in, out);
  	}
***************
*** 1780,1785 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardStatus (no ScardState) Code=0x%.8x-->\n",
! 			     (unsigned int) rv));
  		return SC_returnCode(rv, &lcHandle, in, out);
  	}
--- 1789,1794 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardStatus (no ScardState) Code=0x%.8x, %s-->\n",
! 			     (unsigned int) rv, pcsc_stringify_error(rv)));
  		return SC_returnCode(rv, &lcHandle, in, out);
  	}
***************
*** 1859,1863 ****
  	if (rv)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardListReaderGroups Code=0x%.8x-->\n", (unsigned int) rv));
  		return SC_returnCode(rv, &lcHandle, in, out);
  	}
--- 1868,1873 ----
  	if (rv)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardListReaderGroups Code=0x%.8x, %s-->\n",
! 			     (unsigned int) rv, pcsc_stringify_error(rv)));
  		return SC_returnCode(rv, &lcHandle, in, out);
  	}
***************
*** 1950,1954 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardGetAttrib Code=0x%.8x-->\n", (unsigned int) rv));
  		return SC_returnCode(rv, &lcHandle, in, out);
  	}
--- 1960,1965 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardGetAttrib Code=0x%.8x, %s-->\n", (unsigned int) rv,
! 			     pcsc_stringify_error(rv)));
  		return SC_returnCode(rv, &lcHandle, in, out);
  	}
***************
*** 2018,2022 ****
  	if (rv)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardSetAttrib Code=0x%.8x-->\n", (unsigned int) rv));
  	}
  	else
--- 2029,2034 ----
  	if (rv)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardSetAttrib Code=0x%.8x, %s-->\n", (unsigned int) rv,
! 			     pcsc_stringify_error(rv)));
  	}
  	else
***************
*** 2121,2125 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardControl Code=0x%.8x-->\n", (unsigned int) rv));
  	}
  	else
--- 2133,2138 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		DEBUG_SCARD(("<--ERROR SCardControl Code=0x%.8x, %s-->\n", (unsigned int) rv,
! 			     pcsc_stringify_error(rv)));
  	}
  	else


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642