diff options
| author | Alexander Barton <alex@barton.de> | 2010-09-14 00:30:45 +0200 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2010-09-14 00:30:45 +0200 |
| commit | b3cfbc3d28de9098be7cffc22ea9c5b98c36443f (patch) | |
| tree | 0f7a3ba79e0cdd2e4d9563fd819493f260419991 | |
| parent | 74578890b71dc16aadaf299af875b45fc7fbe081 (diff) | |
| download | ngircd-b3cfbc3d28de9098be7cffc22ea9c5b98c36443f.tar.gz ngircd-b3cfbc3d28de9098be7cffc22ea9c5b98c36443f.zip | |
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;".
| -rw-r--r-- | src/ngircd/sighandlers.c | 15 | ||||
| -rw-r--r-- | src/ngircd/sighandlers.h | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c index d472b7fc..aaff1eab 100644 --- a/src/ngircd/sighandlers.c +++ b/src/ngircd/sighandlers.c @@ -36,6 +36,10 @@ static int signalpipe[2]; +static const int signals_catch[] = { + SIGINT, SIGQUIT, SIGTERM, SIGHUP, SIGCHLD, SIGUSR1, SIGUSR2 +}; + #ifdef DEBUG @@ -86,11 +90,12 @@ Signal_Unblock(int sig) #endif } + /** * Reload the server configuration file. */ static void -NGIRCd_Rehash( void ) +Rehash(void) { 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." ); -} /* NGIRCd_Rehash */ - +} /* Rehash */ /** @@ -154,8 +158,6 @@ Signal_Handler(int Signal) /* shut down sever */ NGIRCd_SignalQuit = true; return; - case SIGHUP: - break; 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 */ - NGIRCd_Rehash(); + Rehash(); 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. diff --git a/src/ngircd/sighandlers.h b/src/ngircd/sighandlers.h index 1c0edbb5..98f91e8f 100644 --- 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 |