]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
fix prototype of signal handler functions (sun studio doesn't like these wrong)
authorMichael Jerris <mike@jerris.com>
Mon, 2 Oct 2006 16:48:00 +0000 (16:48 +0000)
committerMichael Jerris <mike@jerris.com>
Mon, 2 Oct 2006 16:48:00 +0000 (16:48 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2949 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/switch.c
src/switch_core.c

index ac5ea635557114ec51a983e5287213dc796a0688..5f89d8f8dd16c552f3c2b71b15e55bef552663f9 100644 (file)
@@ -51,12 +51,12 @@ static char *pfile = PIDFILE;
 static HANDLE shutdown_event;
 #endif
 
-       static int handle_SIGHUP(int sig)
+static void handle_SIGHUP(int sig)
 {
        uint32_t arg = 0;
        if(sig);
        switch_core_session_ctl(SCSC_SHUTDOWN, &arg);
-       return 0;
+       return;
 }
 
 
@@ -228,8 +228,8 @@ int main(int argc, char *argv[])
        if (bg) {
                ppath = lfile;
 
-               signal(SIGHUP, (void *) handle_SIGHUP);
-               signal(SIGTERM, (void *) handle_SIGHUP);
+               signal(SIGHUP, handle_SIGHUP);
+               signal(SIGTERM, handle_SIGHUP);
 
 #ifdef WIN32
                FreeConsole();
index 67ea3e4cb8effc08c172f27dee63a81d24d88e6d..659df3c8d35e3f254d50cd7f07fad67a86d9e660 100644 (file)
@@ -3677,26 +3677,26 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(char *console, const char **err
        return SWITCH_STATUS_SUCCESS;
 }
 #ifdef SIGPIPE
-static int handle_SIGPIPE(int sig)
+static void handle_SIGPIPE(int sig)
 {
        if(sig);
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Sig Pipe!\n");
-       return 0;
+       return;
 }
 #endif
 #ifdef TRAP_BUS
-static int handle_SIGBUS(int sig)
+static void handle_SIGBUS(int sig)
 {
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Sig BUS!\n");
-       return 0;
+       return;
 }
 #endif
 
 /* no ctl-c mofo */
-static int handle_SIGINT(int sig)
+static void handle_SIGINT(int sig)
 {
        if (sig);
-       return 0;
+       return;
 }
 SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(char *console, const char **err)
 {
@@ -3706,12 +3706,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_init_and_modload(char *console, cons
        }
 
        /* set signal handlers */
-       signal(SIGINT, (void *) handle_SIGINT);
+       signal(SIGINT, handle_SIGINT);
 #ifdef SIGPIPE
-       signal(SIGPIPE, (void *) handle_SIGPIPE);
+       signal(SIGPIPE, handle_SIGPIPE);
 #endif
 #ifdef TRAP_BUS
-       signal(SIGBUS, (void *) handle_SIGBUS);
+       signal(SIGBUS, handle_SIGBUS);
 #endif
        
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Bringing up environment.\n");