X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fsighandlers.c;h=aaff1eabfa2099488ffca7f648fe2eec50a60d33;hb=b3cfbc3d28de9098be7cffc22ea9c5b98c36443f;hp=57bf80f58de384fda219f8167026282cc3cfa5d5;hpb=3600dc60fc54e4317b04ca5896515cf9913910c0;p=ngircd-alex.git

diff --git a/src/ngircd/sighandlers.c b/src/ngircd/sighandlers.c
index 57bf80f5..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
 
@@ -54,7 +58,8 @@ Dump_State(void)
 #endif
 
 
-static void Signal_Block(int sig)
+static void
+Signal_Block(int sig)
 {
 #ifdef HAVE_SIGPROCMASK
 	sigset_t set;
@@ -69,7 +74,8 @@ static void Signal_Block(int sig)
 }
 
 
-static void Signal_Unblock(int sig)
+static void
+Signal_Unblock(int sig)
 {
 #ifdef HAVE_SIGPROCMASK
 	sigset_t set;
@@ -84,11 +90,12 @@ static void 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;
@@ -130,8 +137,7 @@ NGIRCd_Rehash( void )
 	Conn_SyncServerStruct( );
 
 	Log( LOG_NOTICE|LOG_snotice, "Re-reading of configuration done." );
-} /* NGIRCd_Rehash */
-
+} /* Rehash */
 
 
 /**
@@ -142,7 +148,8 @@ NGIRCd_Rehash( void )
  * It blocks the signal and queues it for later execution by Signal_Handler_BH.
  * @param Signal Number of the signal to handle.
  */
-static void Signal_Handler(int Signal)
+static void
+Signal_Handler(int Signal)
 {
 	switch (Signal) {
 	case SIGTERM:
@@ -151,8 +158,6 @@ static void 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)
@@ -203,12 +208,13 @@ static void Signal_Handler(int Signal)
  * thus its not necessary to only use functions that are signal safe.
  * @param Signal Number of the signal that was queued.
  */
-static void Signal_Handler_BH(int Signal)
+static void
+Signal_Handler_BH(int Signal)
 {
 	switch (Signal) {
 	case SIGHUP:
 		/* re-read configuration */
-		NGIRCd_Rehash();
+		Rehash();
 		break;
 #ifdef DEBUG
 	case SIGUSR2:
@@ -222,7 +228,9 @@ static void Signal_Handler_BH(int Signal)
 	Signal_Unblock(Signal);
 }
 
-static void Sig_callback(int fd, short UNUSED what)
+
+static void
+Signal_Callback(int fd, short UNUSED what)
 {
 	int sig, ret;
 	(void) what;
@@ -246,13 +254,13 @@ static void Sig_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.
  * @return true if initialization was sucessful.
  */
-bool Signals_Init(void)
+bool
+Signals_Init(void)
 {
 	size_t i;
 #ifdef HAVE_SIGACTION
@@ -290,9 +298,8 @@ bool Signals_Init(void)
 
 	signal(SIGPIPE, SIG_IGN);
 #endif
-	return io_event_create(signalpipe[0], IO_WANTREAD,
-					Sig_callback);
-} /* Initialize_Signal_Handler */
+	return io_event_create(signalpipe[0], IO_WANTREAD, Signal_Callback);
+} /* Signals_Init */
 
 
 /**
@@ -302,7 +309,8 @@ bool Signals_Init(void)
  * child prodcess, especially when we are about to call
  * 3rd party code (e.g. PAM).
  */
-void Signals_Exit(void)
+void
+Signals_Exit(void)
 {
 	size_t i;
 #ifdef HAVE_SIGACTION