[Pcsclite-cvs-commit] r2961 - in /trunk/PCSC/src: eventhandler.c pcsc-wirecheck-gen.c winscard_clnt.c winscard_msg.c winscard_msg_srv.c winscard_svc.c

rousseau at users.alioth.debian.org rousseau at users.alioth.debian.org
Fri May 16 09:12:53 UTC 2008


Author: rousseau
Date: Fri May 16 09:12:53 2008
New Revision: 2961

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=2961
Log:
remove spaces at end of lines

Modified:
    trunk/PCSC/src/eventhandler.c
    trunk/PCSC/src/pcsc-wirecheck-gen.c
    trunk/PCSC/src/winscard_clnt.c
    trunk/PCSC/src/winscard_msg.c
    trunk/PCSC/src/winscard_msg_srv.c
    trunk/PCSC/src/winscard_svc.c

Modified: trunk/PCSC/src/eventhandler.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/eventhandler.c?rev=2961&op=diff
==============================================================================
--- trunk/PCSC/src/eventhandler.c (original)
+++ trunk/PCSC/src/eventhandler.c Fri May 16 09:12:53 2008
@@ -468,7 +468,7 @@
 		if (rContext->pthCardEvent)
 		{
 			int ret;
-			
+
 			ret = rContext->pthCardEvent(rContext->dwSlot);
 			if (IFD_NO_SUCH_DEVICE == ret)
 				SYS_USleep(PCSCLITE_STATUS_POLL_RATE);

Modified: trunk/PCSC/src/pcsc-wirecheck-gen.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcsc-wirecheck-gen.c?rev=2961&op=diff
==============================================================================
--- trunk/PCSC/src/pcsc-wirecheck-gen.c (original)
+++ trunk/PCSC/src/pcsc-wirecheck-gen.c Fri May 16 09:12:53 2008
@@ -267,7 +267,7 @@
             "{\n");
 
     BLANK_LINE ();
- 
+
     check_constants ();
     check_types ();
 

Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=2961&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Fri May 16 09:12:53 2008
@@ -572,11 +572,11 @@
 	PROFILE_START
 
 	/*
-	 * Make sure this context has been opened 	 
+	 * Make sure this context has been opened
 	 * and get dwContextIndex
-	 */ 	 
-	dwContextIndex = SCardGetContextIndice(hContext); 	 
-	if (dwContextIndex == -1) 	 
+	 */
+	dwContextIndex = SCardGetContextIndice(hContext);
+	if (dwContextIndex == -1)
 		return SCARD_E_INVALID_HANDLE;
 
 	rv = SCardCheckDaemonAvailability();
@@ -595,7 +595,7 @@
 	SYS_MutexLock(psContextMap[dwContextIndex].mMutex);
 
 	/* check the context is still opened */
-	dwContextIndex = SCardGetContextIndice(hContext); 	 
+	dwContextIndex = SCardGetContextIndice(hContext);
 	if (dwContextIndex == -1)
 		/* the context is now invalid
 		 * -> another thread may have called SCardReleaseContext
@@ -759,7 +759,7 @@
 	SYS_MutexLock(psContextMap[dwContextIndex].mMutex);
 
 	/* check the context is still opened */
-	dwContextIndex = SCardGetContextIndice(hContext); 	 
+	dwContextIndex = SCardGetContextIndice(hContext);
 	if (dwContextIndex == -1)
 		/* the context is now invalid
 		 * -> another thread may have called SCardReleaseContext
@@ -910,12 +910,10 @@
 	 * Make sure this handle has been opened
 	 */
 	rv = SCardGetIndicesFromHandle(hCard, &dwContextIndex, &dwChannelIndex);
-
 	if (rv == -1)
 		return SCARD_E_INVALID_HANDLE;
 
 	SYS_MutexLock(psContextMap[dwContextIndex].mMutex);
-
 
 	for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
 	{
@@ -1023,7 +1021,6 @@
 	 * Make sure this handle has been opened
 	 */
 	rv = SCardGetIndicesFromHandle(hCard, &dwContextIndex, &dwChannelIndex);
-
 	if (rv == -1)
 		return SCARD_E_INVALID_HANDLE;
 
@@ -1121,7 +1118,6 @@
 	 * Make sure this handle has been opened
 	 */
 	rv = SCardGetIndicesFromHandle(hCard, &dwContextIndex, &dwChannelIndex);
-
 	if (rv == -1)
 		return SCARD_E_INVALID_HANDLE;
 
@@ -1251,7 +1247,6 @@
 	 * Make sure this handle has been opened
 	 */
 	rv = SCardGetIndicesFromHandle(hCard, &dwContextIndex, &dwChannelIndex);
-
 	if (rv == -1)
 		return SCARD_E_INVALID_HANDLE;
 
@@ -1338,7 +1333,6 @@
 	 * Make sure this handle has been opened
 	 */
 	rv = SCardGetIndicesFromHandle(hCard, &dwContextIndex, &dwChannelIndex);
-
 	if (rv == -1)
 		return SCARD_E_INVALID_HANDLE;
 
@@ -1497,7 +1491,6 @@
 	 * Make sure this handle has been opened
 	 */
 	rv = SCardGetIndicesFromHandle(hCard, &dwContextIndex, &dwChannelIndex);
-
 	if (rv == -1)
 		return SCARD_E_INVALID_HANDLE;
 
@@ -1719,7 +1712,7 @@
 	SYS_MutexLock(psContextMap[dwContextIndex].mMutex);
 
 	/* check the context is still opened */
-	dwContextIndex = SCardGetContextIndice(hContext); 	 
+	dwContextIndex = SCardGetContextIndice(hContext);
 	if (dwContextIndex == -1)
 		/* the context is now invalid
 		 * -> another thread may have called SCardReleaseContext
@@ -1943,7 +1936,7 @@
 					/* add an event counter in the upper word of dwEventState */
 					currReader->dwEventState =
 						((currReader->dwEventState & 0xffff )
-						| (stateCounter << 16));  
+						| (stateCounter << 16));
 				}
 
 	/*********** Check if the reader is in the correct state ********/
@@ -2282,7 +2275,6 @@
 	 * Make sure this handle has been opened
 	 */
 	rv = SCardGetIndicesFromHandle(hCard, &dwContextIndex, &dwChannelIndex);
-
 	if (rv == -1)
 		return SCARD_E_INVALID_HANDLE;
 
@@ -2618,7 +2610,6 @@
 	 * Make sure this handle has been opened
 	 */
 	rv = SCardGetIndicesFromHandle(hCard, &dwContextIndex, &dwChannelIndex);
-
 	if (rv == -1)
 		return SCARD_E_INVALID_HANDLE;
 
@@ -2780,7 +2771,6 @@
 	 * Make sure this handle has been opened
 	 */
 	rv = SCardGetIndicesFromHandle(hCard, &dwContextIndex, &dwChannelIndex);
-
 	if (rv == -1)
 	{
 		*pcbRecvLength = 0;
@@ -3044,7 +3034,7 @@
 	SYS_MutexLock(psContextMap[dwContextIndex].mMutex);
 
 	/* check the context is still opened */
-	dwContextIndex = SCardGetContextIndice(hContext); 	 
+	dwContextIndex = SCardGetContextIndice(hContext);
 	if (dwContextIndex == -1)
 		/* the context is now invalid
 		 * -> another thread may have called SCardReleaseContext
@@ -3159,7 +3149,7 @@
 	SYS_MutexLock(psContextMap[dwContextIndex].mMutex);
 
 	/* check the context is still opened */
-	dwContextIndex = SCardGetContextIndice(hContext); 	 
+	dwContextIndex = SCardGetContextIndice(hContext);
 	if (dwContextIndex == -1)
 		/* the context is now invalid
 		 * -> another thread may have called SCardReleaseContext
@@ -3446,7 +3436,6 @@
 	LONG rv;
 
 	rv = SCardGetIndicesFromHandle(hCard, &dwContextIndice, &dwChannelIndice);
-
 	if (rv == -1)
 		return SCARD_E_INVALID_HANDLE;
 	else

Modified: trunk/PCSC/src/winscard_msg.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg.c?rev=2961&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg.c (original)
+++ trunk/PCSC/src/winscard_msg.c Fri May 16 09:12:53 2008
@@ -361,7 +361,7 @@
 #else
 			/* is the daemon still there? */
 			if (SCardCheckDaemonAvailability() != SCARD_S_SUCCESS)
-			{	
+			{
 				/*
 				 * timeout
 				 */
@@ -439,7 +439,7 @@
 			memcpy(msgStruct.data, data, size);
 			memset(msgStruct.data+size, 0, sizeof(msgStruct.data)-size);
 		}
-			
+
 		ret = SHMMessageSend(&msgStruct, sizeof(msgStruct), dwClientID,
 			blockAmount);
 

Modified: trunk/PCSC/src/winscard_msg_srv.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg_srv.c?rev=2961&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg_srv.c (original)
+++ trunk/PCSC/src/winscard_msg_srv.c Fri May 16 09:12:53 2008
@@ -174,7 +174,7 @@
 	int selret;
 #ifdef DO_TIMEOUT
 	struct timeval tv;
-	 	
+
 	tv.tv_sec = 1;
 	tv.tv_usec = 0;
 #endif

Modified: trunk/PCSC/src/winscard_svc.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_svc.c?rev=2961&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_svc.c (original)
+++ trunk/PCSC/src/winscard_svc.c Fri May 16 09:12:53 2008
@@ -314,7 +314,7 @@
 
 	case SCARD_CONNECT:
 		coStr = ((connect_struct *) msgStruct->data);
-                
+
 		hCard = coStr->phCard;
 		dwActiveProtocol = coStr->pdwActiveProtocol;
 
@@ -439,7 +439,7 @@
 		gsStr = ((getset_struct *) msgStruct->data);
 		rv = MSGCheckHandleAssociation(gsStr->hCard, dwContextIndex);
 		if (rv != 0) return rv;
-                
+
 		cbAttrLen = gsStr->cbAttrLen;
 
 		gsStr->rv = SCardGetAttrib(gsStr->hCard, gsStr->dwAttrId,
@@ -654,7 +654,7 @@
 				dwLockId = rContext->dwLockId;
 				rContext->dwLockId = 0;
 
-				if (psContext[dwContextIndex].hCard[i] != dwLockId) 
+				if (psContext[dwContextIndex].hCard[i] != dwLockId)
 				{
 					/*
 					 * if the card is locked by someone else we do not reset it




More information about the Pcsclite-cvs-commit mailing list