cleanups to function signatures, prototypes, visibility

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1089600 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/os/win32/os.h b/os/win32/os.h
index cd1d28c54ff893972c7198d44b994ece3b94cdfc..9b9e0580e31c0cb4135888def215dbaddd3c163d 100644 (file)
--- a/os/win32/os.h
+++ b/os/win32/os.h
@@ -89,7 +89,7 @@ typedef enum {
 
 FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal);
 
-PSECURITY_ATTRIBUTES GetNullACL();
+PSECURITY_ATTRIBUTES GetNullACL(void);
 void CleanNullACL(void *sa);
 
 int set_listeners_noninheritable(apr_pool_t *p);

diff --git a/os/win32/util_win32.c b/os/win32/util_win32.c
index ab96ff113675c17398284550a12762ee81dea97d..c0959777680ebbac43c2fdf013f357d38c08f759 100644 (file)
--- a/os/win32/util_win32.c
+++ b/os/win32/util_win32.c
@@ -105,7 +105,7 @@ FARPROC ap_load_dll_func(ap_dlltoken_e fnLib, char* fnName, int ordinal)
 /* To share the semaphores with other processes, we need a NULL ACL
  * Code from MS KB Q106387
  */
-PSECURITY_ATTRIBUTES GetNullACL()
+PSECURITY_ATTRIBUTES GetNullACL(void)
 {
     PSECURITY_DESCRIPTOR pSD;
     PSECURITY_ATTRIBUTES sa;

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index 6fc31e8c3ea7db09515a54a74218602bcd12c5b8..7c3f6a80b5458d4f1dace7dc54cb7e456622742e 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -849,7 +849,7 @@ static void cleanup_thread(HANDLE *handles, int *thread_cnt,
  * monitors the child process for maintenance and shutdown
  * events.
  */
-static void create_listener_thread()
+static void create_listener_thread(void)
 {
     unsigned tid;
     int num_listeners = 0;

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index eee66cd191bd2faccdfb7e86ec5946c7ab61abf9..1812e6361335d52953cac34f17292818bde6ee2a 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -114,7 +114,7 @@ AP_DECLARE(apr_array_header_t *) ap_get_status_table(apr_pool_t *p)
  * Command processors
  */
 
-static const char *set_threads_per_child (cmd_parms *cmd, void *dummy, char *arg)
+static const char *set_threads_per_child (cmd_parms *cmd, void *dummy, const char *arg)
 {
     const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
     if (err != NULL) {
@@ -258,9 +258,9 @@ AP_DECLARE(void) ap_signal_parent(ap_signal_parent_e type)
  *   start mutex [signal from the parent to begin accept()]
  *   scoreboard shm handle [to recreate the ap_scoreboard]
  */
-void get_handles_from_parent(server_rec *s, HANDLE *child_exit_event,
-                             apr_proc_mutex_t **child_start_mutex,
-                             apr_shm_t **scoreboard_shm)
+static void get_handles_from_parent(server_rec *s, HANDLE *child_exit_event,
+                                    apr_proc_mutex_t **child_start_mutex,
+                                    apr_shm_t **scoreboard_shm)
 {
     HANDLE hScore;
     HANDLE ready_event;
@@ -423,7 +423,7 @@ static int send_handles_to_child(apr_pool_t *p,
  * exclusively in the child process, receives them from the parent and
  * makes them availeble in the child.
  */
-void get_listeners_from_parent(server_rec *s)
+static void get_listeners_from_parent(server_rec *s)
 {
     WSAPROTOCOL_INFO WSAProtocolInfo;
     ap_listen_rec *lr;
@@ -962,7 +962,7 @@ static int inst_argc;
 static const char * const *inst_argv;
 static const char *service_name = NULL;
 
-void winnt_rewrite_args(process_rec *process)
+static void winnt_rewrite_args(process_rec *process)
 {
     /* Handle the following SCM aspects in this phase:
      *

diff --git a/server/mpm/winnt/mpm_winnt.h b/server/mpm/winnt/mpm_winnt.h
index efc1b61c825c97e34eaedc72a08ed9283f303d88..32637c11b6b069ef76aabf93da7c387d475005d7 100644 (file)
--- a/server/mpm/winnt/mpm_winnt.h
+++ b/server/mpm/winnt/mpm_winnt.h
@@ -89,5 +89,9 @@ typedef enum {
 AP_DECLARE(void) ap_signal_parent(ap_signal_parent_e type);
 
 void hold_console_open_on_error(void);
+
+/* From child.c: */
+void child_main(apr_pool_t *pconf);
+
 #endif /* APACHE_MPM_WINNT_H */
 /** @} */

diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c
index ffe736d6586e3c65dfe8be0a540020c2597b8874..808bfeacf16bc9b767cb5d184daadde067b9b9b9 100644 (file)
--- a/server/mpm/winnt/service.c
+++ b/server/mpm/winnt/service.c
@@ -426,7 +426,7 @@ static void __stdcall service_nt_main_fn(DWORD argc, LPTSTR *argv)
 }
 
 
-DWORD WINAPI service_nt_dispatch_thread(LPVOID nada)
+static DWORD WINAPI service_nt_dispatch_thread(LPVOID nada)
 {
     apr_status_t rv = APR_SUCCESS;
 
@@ -546,7 +546,7 @@ apr_status_t mpm_merge_service_args(apr_pool_t *p,
 }
 
 
-void service_stopped(void)
+static void service_stopped(void)
 {
     /* Still have a thread & window to clean up, so signal now */
     if (globdat.service_thread)