[Pcsclite-cvs-commit] r6710 - trunk/PCSC/src

[ludovic.rousseau at free.fr]

Author: rousseau
Date: 2013-08-05 18:53:24 +0000 (Mon, 05 Aug 2013)
New Revision: 6710

Modified:
   trunk/PCSC/src/pcscdaemon.c
Log:
SVCServiceRunLoop(): be able to quit earlier

The daemon is now able to quit (test the arakiri flag) even before
SVCServiceRunLoop() has been called.

Thanks to Alan Kozlay for the patch


Modified: trunk/PCSC/src/pcscdaemon.c
===================================================================
--- trunk/PCSC/src/pcscdaemon.c	2013-08-05 18:49:31 UTC (rev 6709)
+++ trunk/PCSC/src/pcscdaemon.c	2013-08-05 18:53:24 UTC (rev 6710)
@@ -86,6 +86,20 @@
 
 	while (TRUE)
 	{
+		if (AraKiri)
+		{
+			/* stop the hotpug thread and waits its exit */
+#ifdef USE_USB
+			(void)HPStopHotPluggables();
+#endif
+			(void)SYS_Sleep(1);
+
+			/* now stop all the drivers */
+			RFCleanupReaders();
+			ContextsDeinitialize();
+			at_exit();
+		}
+
 		switch (rsp = ProcessEventsServer(&dwClientID))
 		{
 
@@ -120,20 +134,6 @@
 				rsp);
 			break;
 		}
-
-		if (AraKiri)
-		{
-			/* stop the hotpug thread and waits its exit */
-#ifdef USE_USB
-			(void)HPStopHotPluggables();
-#endif
-			(void)SYS_Sleep(1);
-
-			/* now stop all the drivers */
-			RFCleanupReaders();
-			ContextsDeinitialize();
-			at_exit();
-		}
 	}
 }