sighandlers.{c|h}: Code cleanup

 - declare signals_catch[] array not between the function implementations.
 - rename now local function NGIRCd_Rehash() to Rehash().
 - remove empty and therefore not used "catch SIGHUP; break;".

diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c
index d472b7fcbb1c165e269c57d9dde761ec65835928..aaff1eabfa2099488ffca7f648fe2eec50a60d33 100644 (file)
--- a/src/ngircd/sighandlers.c
+++ b/src/ngircd/sighandlers.c
@@ -36,6 +36,10 @@
 
 static int signalpipe[2];
 
 
 static int signalpipe[2];
 

+static const int signals_catch[] = {
+       SIGINT, SIGQUIT, SIGTERM, SIGHUP, SIGCHLD, SIGUSR1, SIGUSR2
+};
+

 
 #ifdef DEBUG
 
 
 #ifdef DEBUG
 


@@ -86,11 +90,12 @@ Signal_Unblock(int sig)
 #endif
 }
 
 #endif
 }
 

+

 /**
  * Reload the server configuration file.
  */
 static void
 /**
  * Reload the server configuration file.
  */
 static void

-NGIRCd_Rehash( void )
+Rehash(void)

 {
        char old_name[CLIENT_ID_LEN];
        unsigned old_nicklen;
 {
        char old_name[CLIENT_ID_LEN];
        unsigned old_nicklen;


@@ -132,8 +137,7 @@ NGIRCd_Rehash( void )
        Conn_SyncServerStruct( );
 
        Log( LOG_NOTICE|LOG_snotice, "Re-reading of configuration done." );
        Conn_SyncServerStruct( );
 
        Log( LOG_NOTICE|LOG_snotice, "Re-reading of configuration done." );

-} /* NGIRCd_Rehash */
-
+} /* Rehash */

 
 
 /**
 
 
 /**


@@ -154,8 +158,6 @@ Signal_Handler(int Signal)
                /* shut down sever */
                NGIRCd_SignalQuit = true;
                return;
                /* shut down sever */
                NGIRCd_SignalQuit = true;
                return;

-       case SIGHUP:
-               break;

        case SIGCHLD:
                /* child-process exited, avoid zombies */
                while (waitpid( -1, NULL, WNOHANG) > 0)
        case SIGCHLD:
                /* child-process exited, avoid zombies */
                while (waitpid( -1, NULL, WNOHANG) > 0)


@@ -212,7 +214,7 @@ Signal_Handler_BH(int Signal)
        switch (Signal) {
        case SIGHUP:
                /* re-read configuration */
        switch (Signal) {
        case SIGHUP:
                /* re-read configuration */

-               NGIRCd_Rehash();
+               Rehash();

                break;
 #ifdef DEBUG
        case SIGUSR2:
                break;
 #ifdef DEBUG
        case SIGUSR2:


@@ -252,7 +254,6 @@ Signal_Callback(int fd, short UNUSED what)
 }
 
 
 }
 
 

-static const int signals_catch[] = { SIGINT, SIGQUIT, SIGTERM, SIGHUP, SIGCHLD, SIGUSR1, SIGUSR2 };

 /**
  * Initialize the signal handlers, catch
  * those signals we are interested in and sets SIGPIPE to be ignored.
 /**
  * Initialize the signal handlers, catch
  * those signals we are interested in and sets SIGPIPE to be ignored.

diff --git a/src/ngircd/sighandlers.h b/src/ngircd/sighandlers.h
index 1c0edbb58d15747151f31698c7494634d2186068..98f91e8f4d561f3e0f88013f29a379e77bcfcbad 100644 (file)
--- a/src/ngircd/sighandlers.h
+++ b/src/ngircd/sighandlers.h
@@ -1,4 +1,6 @@
 /*
 /*

+ * ngIRCd -- The Next Generation IRC Daemon
+ *

  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or