CVS: rdesktop scard.c,1.4,1.5

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

Modified Files:
	scard.c 
Log Message:
remove a bit code duplication


Index: scard.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** scard.c	1 Nov 2006 21:37:56 -0000	1.4
--- scard.c	1 Nov 2006 22:46:05 -0000	1.5
***************
*** 2159,2176 ****
  #endif
  
- #ifdef WITH_PCSC120
  	sc_nBytesReturned = nBytesReturned;
  	myHCard = scHandleToMyPCSC(hCard);
  	rv = SCardControl(myHCard, pInBuffer, (MYPCSC_DWORD) nInBufferSize, pOutBuffer,
  			  &sc_nBytesReturned);
- 	nBytesReturned = sc_nBytesReturned;
  #else
- 	sc_nBytesReturned = nBytesReturned;
- 	myHCard = scHandleToMyPCSC(hCard);
  	rv = SCardControl(myHCard, (MYPCSC_DWORD) dwControlCode, pInBuffer,
  			  (MYPCSC_DWORD) nInBufferSize, pOutBuffer,
  			  (MYPCSC_DWORD) nOutBufferRealSize, &sc_nBytesReturned);
- 	nBytesReturned = sc_nBytesReturned;
  #endif
  
  #ifdef WITH_SCARD_DEBUG
--- 2159,2173 ----
  #endif
  
  	sc_nBytesReturned = nBytesReturned;
  	myHCard = scHandleToMyPCSC(hCard);
+ #ifdef WITH_PCSC120
  	rv = SCardControl(myHCard, pInBuffer, (MYPCSC_DWORD) nInBufferSize, pOutBuffer,
  			  &sc_nBytesReturned);
  #else
  	rv = SCardControl(myHCard, (MYPCSC_DWORD) dwControlCode, pInBuffer,
  			  (MYPCSC_DWORD) nInBufferSize, pOutBuffer,
  			  (MYPCSC_DWORD) nOutBufferRealSize, &sc_nBytesReturned);
  #endif
+ 	nBytesReturned = sc_nBytesReturned;
  
  #ifdef WITH_SCARD_DEBUG


-------------------------------------------------------------------------
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