[Pcsclite-cvs-commit] r4524 - in /trunk/PCSC/src: pcscdaemon.c readerfactory.c readerfactory.h

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Wed Oct 28 14:39:12 2009
New Revision: 4524

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4524
Log:
call exit() in SVCServiceRunLoop() instead of RFCleanupReaders() and
remove the RFCleanupReaders() parameter

Modified:
    trunk/PCSC/src/pcscdaemon.c
    trunk/PCSC/src/readerfactory.c
    trunk/PCSC/src/readerfactory.h

Modified: trunk/PCSC/src/pcscdaemon.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcscdaemon.c?rev=4524&op=diff
==============================================================================
--- trunk/PCSC/src/pcscdaemon.c (original)
+++ trunk/PCSC/src/pcscdaemon.c Wed Oct 28 14:39:12 2009
@@ -175,7 +175,8 @@
 			(void)SYS_Sleep(1);
 
 			/* now stop all the drivers */
-			RFCleanupReaders(1);
+			RFCleanupReaders();
+			exit(0);
 		}
 	}
 }

Modified: trunk/PCSC/src/readerfactory.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.c?rev=4524&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.c (original)
+++ trunk/PCSC/src/readerfactory.c Wed Oct 28 14:39:12 2009
@@ -1172,7 +1172,7 @@
 		return SCARD_S_SUCCESS;
 }
 
-void RFCleanupReaders(int shouldExit)
+void RFCleanupReaders(void)
 {
 	int i;
 
@@ -1198,10 +1198,6 @@
 				Log2(PCSC_LOG_ERROR, "RFRemoveReader error: 0x%08X", rv);
 		}
 	}
-
-	/* exit() will call at_exit() */
-	if (shouldExit)
-		exit(0);
 }
 
 int RFStartSerialReaders(const char *readerconf)

Modified: trunk/PCSC/src/readerfactory.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.h?rev=4524&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.h (original)
+++ trunk/PCSC/src/readerfactory.h Wed Oct 28 14:39:12 2009
@@ -164,7 +164,7 @@
 	LONG RFCheckReaderEventState(PREADER_CONTEXT, SCARDHANDLE);
 	LONG RFClearReaderEventState(PREADER_CONTEXT, SCARDHANDLE);
 	LONG RFCheckReaderStatus(PREADER_CONTEXT);
-	void RFCleanupReaders(int);
+	void RFCleanupReaders(void);
 	int RFStartSerialReaders(const char *readerconf);
 	void RFReCheckReaderConf(void);
 	void RFSuspendAllReaders(void);