fix litespeed SAPI build warnings.

helpers only called on linux anyways, proper C calls prototypes.

Author: devnexen

sapi/litespeed/lsapi_main.c

@@ -537,9 +537,9 @@ static void log_message (const char *fmt, ...)
 #define DEBUG_MESSAGE(fmt, ...)
 #endif
 
-static int lsapi_activate_user_ini();
+static int lsapi_activate_user_ini(void);
 
-static int sapi_lsapi_activate()
+static int sapi_lsapi_activate(void)
 {
     char *path, *server_name;
     size_t path_len, server_name_len;
@@ -677,10 +677,9 @@ static int do_clean_shutdown = 1;
 static int clean_onexit = 1;
 
 
-static void lsapi_clean_shutdown()
+static void lsapi_clean_shutdown(void)
 {
     struct sigaction act;
-    int sa_rc;
     struct itimerval tmv;
 #if PHP_MAJOR_VERSION >= 7
     zend_string * key;
@@ -689,15 +688,31 @@ static void lsapi_clean_shutdown()
     sigemptyset(&act.sa_mask);
     act.sa_flags = 0;
     act.sa_handler = lsapi_sigsegv;
-    sa_rc = sigaction(SIGINT,  &act, NULL);
-    sa_rc = sigaction(SIGQUIT, &act, NULL);
-    sa_rc = sigaction(SIGILL,  &act, NULL);
-    sa_rc = sigaction(SIGABRT, &act, NULL);
-    sa_rc = sigaction(SIGBUS,  &act, NULL);
-    sa_rc = sigaction(SIGSEGV, &act, NULL);
-    sa_rc = sigaction(SIGTERM, &act, NULL);
-
-    sa_rc = sigaction(SIGPROF, &act, NULL);
+    if (sigaction(SIGINT,  &act, NULL) < 0) {
+	    return;
+    }
+    if (sigaction(SIGQUIT, &act, NULL) < 0) {
+	    return;
+    }
+    if (sigaction(SIGILL,  &act, NULL) < 0) {
+	    return;
+    }
+    if (sigaction(SIGABRT, &act, NULL) < 0) {
+	    return;
+    }
+    if (sigaction(SIGBUS,  &act, NULL) < 0) {
+	    return;
+    }
+    if (sigaction(SIGSEGV, &act, NULL) < 0) {
+	    return;
+    }
+    if (sigaction(SIGTERM, &act, NULL) < 0) {
+	    return;
+    }
+
+    if (sigaction(SIGPROF, &act, NULL) < 0) {
+	    return;
+    }
     memset(&tmv, 0, sizeof(struct itimerval));
     tmv.it_value.tv_sec = 0;
     tmv.it_value.tv_usec = 100000;
@@ -738,11 +753,9 @@ static void lsapi_atexit(void)
     }
 }
 
-
 static int lsapi_module_main(int show_source)
 {
     struct sigaction act;
-    int sa_rc;
     if (php_request_startup() == FAILURE ) {
         return -1;
     }
@@ -751,13 +764,28 @@ static int lsapi_module_main(int show_source)
         sigemptyset(&act.sa_mask);
         act.sa_flags = SA_NODEFER;
         act.sa_handler = lsapi_sigterm;
-        sa_rc = sigaction( SIGINT, &act, NULL);
-        sa_rc = sigaction( SIGQUIT, &act, NULL);
-        sa_rc = sigaction( SIGILL, &act, NULL);
-        sa_rc = sigaction( SIGABRT, &act, NULL);
-        sa_rc = sigaction( SIGBUS, &act, NULL);
-        sa_rc = sigaction( SIGSEGV, &act, NULL);
-        sa_rc = sigaction( SIGTERM, &act, NULL);
+        if (sigaction( SIGINT, &act, NULL) < 0) {
+		return -1;
+        }
+
+        if (sigaction( SIGQUIT, &act, NULL) < 0) {
+		return -1;
+        }
+        if (sigaction( SIGILL, &act, NULL) < 0) {
+		return -1;
+        }
+        if (sigaction( SIGABRT, &act, NULL) < 0) {
+		return -1;
+        }
+        if (sigaction( SIGBUS, &act, NULL) < 0) {
+		return -1;
+        }
+        if (sigaction( SIGSEGV, &act, NULL) < 0) {
+		return -1;
+        }
+        if (sigaction( SIGTERM, &act, NULL) < 0) {
+		return -1;
+        }
 
         clean_onexit = 0;
     }

sapi/litespeed/lsapilib.c

@@ -922,6 +922,7 @@ static int LSAPI_perror_r( LSAPI_Request * pReq, const char * pErr1, const char
 }
 
 
+#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
 static int lsapi_lve_error( LSAPI_Request * pReq )
 {
     static const char * headers[] =
@@ -945,10 +946,8 @@ static int lsapi_lve_error( LSAPI_Request * pReq )
     return 0;
 }
 
-
 static int lsapi_enterLVE( LSAPI_Request * pReq, uid_t uid )
 {
-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
     if ( s_lve && uid ) //root user should not do that
     {
         uint32_t cookie;
@@ -962,16 +961,13 @@ static int lsapi_enterLVE( LSAPI_Request * pReq, uid_t uid )
             return -1;
         }
     }
-#endif
 
     return 0;
 }
 
-
 static int lsapi_jailLVE( LSAPI_Request * pReq, uid_t uid, struct passwd * pw )
 {
     int ret = 0;
-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
     char  error_msg[1024] = "";
     ret = (*fp_lve_jail)( pw, error_msg );
     if ( ret < 0 )
@@ -981,12 +977,10 @@ static int lsapi_jailLVE( LSAPI_Request * pReq, uid_t uid, struct passwd * pw )
         LSAPI_perror_r( pReq, "LSAPI: jail() failure.", NULL );
         return -1;
     }
-#endif
     return ret;
 }
 
 
-#if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
 static int lsapi_initLVE(void)
 {
     const char * pEnv;
@@ -1368,7 +1362,7 @@ static inline int lsapi_notify_pid( int fd )
 
 
 static char s_conn_key_packet[16];
-static inline int init_conn_key( int fd )
+static inline __attribute__((unused)) int init_conn_key( int fd )
 {
     struct lsapi_packet_header * pHeader = (struct lsapi_packet_header *)s_conn_key_packet;
     struct timeval tv;
@@ -3160,11 +3154,11 @@ static void lsapi_check_child_status( long tmCur )
 //}
 
 
-void set_skip_write()
+void set_skip_write(void)
 {   s_skip_write = 1;   }
 
 
-int is_enough_free_mem()
+int is_enough_free_mem(void)
 {
 #if defined(linux) || defined(__linux) || defined(__linux__) || defined(__gnu_linux__)
     //minimum 1GB or 10% available free memory
@@ -3832,7 +3826,7 @@ void LSAPI_No_Check_ppid(void)
 }
 
 
-int LSAPI_Get_ppid()
+int LSAPI_Get_ppid(void)
 {
     return(s_ppid);
 }