[Pcsclite-cvs-commit] r2738 - in /trunk/PCSC/src: hotplug.h pcscdaemon.c utils.c utils.h

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jan 15 14:21:02 2008
New Revision: 2738

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=2738
Log:
move SendHotplugSignal() from pcscdaemon.c to utils.c

Modified:
    trunk/PCSC/src/hotplug.h
    trunk/PCSC/src/pcscdaemon.c
    trunk/PCSC/src/utils.c
    trunk/PCSC/src/utils.h

Modified: trunk/PCSC/src/hotplug.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug.h?rev=2738&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug.h (original)
+++ trunk/PCSC/src/hotplug.h Tue Jan 15 14:21:02 2008
@@ -36,7 +36,6 @@
 	ULONG HPRegisterForHotplugEvents(void);
 	LONG HPStopHotPluggables(void);
 	void HPReCheckSerialReaders(void);
-	int SendHotplugSignal(void);
 
 #ifdef __cplusplus
 }

Modified: trunk/PCSC/src/pcscdaemon.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcscdaemon.c?rev=2738&op=diff
==============================================================================
--- trunk/PCSC/src/pcscdaemon.c (original)
+++ trunk/PCSC/src/pcscdaemon.c Tue Jan 15 14:21:02 2008
@@ -71,26 +71,6 @@
 void print_usage (char const * const);
 
 PCSCLITE_MUTEX usbNotifierMutex;
-
-int SendHotplugSignal(void)
-{
-	pid_t pid;
-
-	pid = GetDaemonPid();
-
-	if (pid != -1)
-	{
-		Log2(PCSC_LOG_INFO, "Send hotplug signal to pcscd (pid=%d)", pid);
-		if (kill(pid, SIGUSR1) < 0)
-		{
-			Log3(PCSC_LOG_CRITICAL, "Can't signal pcscd (pid=%d): %s",
-				pid, strerror(errno));
-			return EXIT_FAILURE ;
-		}
-	}
-
-	return EXIT_SUCCESS;
-} /* SendHotplugSignal */
 
 /*
  * Cleans up messages still on the queue when a client dies

Modified: trunk/PCSC/src/utils.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/utils.c?rev=2738&op=diff
==============================================================================
--- trunk/PCSC/src/utils.c (original)
+++ trunk/PCSC/src/utils.c Tue Jan 15 14:21:02 2008
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
 
 #include "debug.h"
 #include "config.h"
@@ -51,3 +52,23 @@
 	return pid;
 } /* GetDaemonPid */
 
+int SendHotplugSignal(void)
+{
+	pid_t pid;
+
+	pid = GetDaemonPid();
+
+	if (pid != -1)
+	{
+		Log2(PCSC_LOG_INFO, "Send hotplug signal to pcscd (pid=%d)", pid);
+		if (kill(pid, SIGUSR1) < 0)
+		{
+			Log3(PCSC_LOG_CRITICAL, "Can't signal pcscd (pid=%d): %s",
+				pid, strerror(errno));
+			return EXIT_FAILURE ;
+		}
+	}
+
+	return EXIT_SUCCESS;
+} /* SendHotplugSignal */
+

Modified: trunk/PCSC/src/utils.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/utils.h?rev=2738&op=diff
==============================================================================
--- trunk/PCSC/src/utils.h (original)
+++ trunk/PCSC/src/utils.h Tue Jan 15 14:21:02 2008
@@ -17,6 +17,7 @@
 
 /* defined in winscard_clnt.c */
 LONG SCardCheckDaemonAvailability(void);
+int SendHotplugSignal(void);
 
 #endif