CVS: rdesktop rdpdr.c,1.51,1.52 scard.c,1.22,1.23

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

Modified Files:
	rdpdr.c scard.c 
Log Message:
Improve readability of smart card code.


Index: rdpdr.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpdr.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** rdpdr.c	10 Apr 2007 11:22:10 -0000	1.51
--- rdpdr.c	3 Jul 2007 14:08:06 -0000	1.52
***************
*** 685,692 ****
  			out.size = sizeof(buffer);
  
- 			DEBUG_SCARD(("[SMART-CARD TRACE]\n"));
- 			DEBUG_SCARD(("device 0x%.8x\n", device));
- 			DEBUG_SCARD(("file   0x%.8x\n", file));
- 			DEBUG_SCARD(("id     0x%.8x\n", id));
  #ifdef WITH_SCARD
  			scardSetInfo(device, id, bytes_out + 0x14);
--- 685,688 ----
***************
*** 695,700 ****
  			result = buffer_len = out.p - out.data;
  
- 			DEBUG_SCARD(("[SMART-CARD TRACE] OUT 0x%.8x\n", status));
- 
  			/* Serial SERIAL_WAIT_ON_MASK */
  			if (status == RD_STATUS_PENDING)
--- 691,694 ----

Index: scard.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/scard.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** scard.c	28 Jun 2007 12:52:13 -0000	1.22
--- scard.c	3 Jul 2007 14:08:06 -0000	1.23
***************
*** 125,129 ****
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		error("[SMART CARD: PCSC service not available]\n");
  		return 0;
  	}
--- 125,129 ----
  	if (rv != SCARD_S_SUCCESS)
  	{
! 		error("scard_enum_devices: PCSC service not available\n");
  		return 0;
[...1284 lines suppressed...]
  		{
- #ifdef WITH_DEBUG_SCARD
- 			sTime = time(NULL);
- #endif
  			pthread_mutex_lock(&listElement->nodata);
  			SC_deviceControl(listElement->data);
  			listElement->data = NULL;
- 			DEBUG_SCARD(("[HANDLING TIME %d]\n", (int) (time(NULL) - sTime)));
  			pthread_mutex_unlock(&listElement->busy);
  		}
--- 2435,2445 ----
***************
*** 2544,2549 ****
  	PThreadListElement cur = threadList, last = threadList;
  
- 	DEBUG_SCARD(("[THREAD COUNT %d]\n", threadCount));
- 
  	while (cur)
  	{
--- 2455,2458 ----


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/