[Pcsclite-cvs-commit] r5385 - /trunk/PCSC/src/winscard_clnt.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Nov  8 09:49:31 2010
New Revision: 5385

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5385
Log:
Move SCardInvalidateHandles() in the same #ifdef DO_CHECK_SAME_PROCESS
as SCardCheckSameProcess() since it is only used in this case.

Modified:
    trunk/PCSC/src/winscard_clnt.c

Modified: trunk/PCSC/src/winscard_clnt.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_clnt.c?rev=5385&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_clnt.c (original)
+++ trunk/PCSC/src/winscard_clnt.c Mon Nov  8 09:49:31 2010
@@ -3598,27 +3598,6 @@
 	return -1;
 }
 
-static LONG SCardInvalidateHandles(void)
-{
-	/* invalid all handles */
-	(void)SCardLockThread();
-
-	while (list_size(&contextMapList) != 0)
-	{
-		SCONTEXTMAP * currentContextMap;
-
-		currentContextMap = list_get_at(&contextMapList, 0);
-		if (currentContextMap != NULL)
-			(void)SCardCleanContext(currentContextMap);
-		else
-			Log1(PCSC_LOG_CRITICAL, "list_get_at returned NULL");
-	}
-
-	(void)SCardUnlockThread();
-
-	return SCARD_E_INVALID_HANDLE;
-}
-
 /**
  * @brief Checks if the server is running.
  *
@@ -3650,6 +3629,27 @@
 }
 
 #ifdef DO_CHECK_SAME_PROCESS
+static LONG SCardInvalidateHandles(void)
+{
+	/* invalid all handles */
+	(void)SCardLockThread();
+
+	while (list_size(&contextMapList) != 0)
+	{
+		SCONTEXTMAP * currentContextMap;
+
+		currentContextMap = list_get_at(&contextMapList, 0);
+		if (currentContextMap != NULL)
+			(void)SCardCleanContext(currentContextMap);
+		else
+			Log1(PCSC_LOG_CRITICAL, "list_get_at returned NULL");
+	}
+
+	(void)SCardUnlockThread();
+
+	return SCARD_E_INVALID_HANDLE;
+}
+
 static LONG SCardCheckSameProcess(void)
 {
 	/* after fork() need to restart */