[tuxdroid-svn] r308 - in daemon/trunk: . libs

[jaguarondi <c2m...@c2...>]

Author: jaguarondi
Date: 2007-05-10 18:41:08 +0200 (Thu, 10 May 2007)
New Revision: 308

Modified:
   daemon/trunk/libs/USBDaemon_globals.h
   daemon/trunk/main.c
Log:
- UPD: renamed on_close_daemon into quit_handler
- CHG: libusb debuglevel set at 0 as those messages are annoying and not necessary when not debugging the USB anyway.


Modified: daemon/trunk/libs/USBDaemon_globals.h
===================================================================
--- daemon/trunk/libs/USBDaemon_globals.h	2007-05-10 16:37:21 UTC (rev 307)
+++ daemon/trunk/libs/USBDaemon_globals.h	2007-05-10 16:41:08 UTC (rev 308)
@@ -42,7 +42,7 @@
 #define TUX_READ_EP                 0x84
 #define TUX_WRITE_TIMEOUT           5000
 #define TUX_READ_TIMEOUT            5000
-#define LIBUSB_DEBUG_LEVEL          1
+#define LIBUSB_DEBUG_LEVEL          0
 #define NEWUID                      65534
 #define NEWGID                      65534
 

Modified: daemon/trunk/main.c
===================================================================
--- daemon/trunk/main.c	2007-05-10 16:37:21 UTC (rev 307)
+++ daemon/trunk/main.c	2007-05-10 16:41:08 UTC (rev 308)
@@ -125,6 +125,11 @@
 
 /**
  * \brief Called when exiting. Performs cleanup.
+ *
+ * This function is registered with atexit() to be called whenever we quit the
+ * daemon normally with exit().
+ *
+ * It disconnects all TCP/IP clients before exiting.
  */
 static void terminate(void)
 {
@@ -138,6 +143,18 @@
 }
 
 /**
+ * \brief Performs a clean exit of the daemon.
+ *
+ * \param[in] sig  Signal (unused)
+ *
+ * Used to catch signals to exit properly.
+ */
+static void quit_handler(int sig)
+{
+    exit(0);
+}
+
+/**
  * \brief Toggle debugging mode on/off.
  *
  * \param[in] sig  Signal (unused)
@@ -231,16 +248,6 @@
 
 /************************************************************************ */
 
-/* On_close_daemon */
-
-/************************************************************************ */
-static void on_close_daemon(int sig)
-{
-    exit(0);
-}
-
-/************************************************************************ */
-
 /* Show usages of tux daemon */
 
 /************************************************************************ */
@@ -277,7 +284,7 @@
     unsigned char daemonized = 0;
 
     /* On exiting */
-    signal(SIGINT, on_close_daemon);
+    signal(SIGINT, quit_handler);
 
     /* Program arguments */
     for (i = 1; i < argc; i++)