Fix the following bunch of warnings in dexter MPM:

egcc -c  -I../../../os/unix -I../../../include -I../../../modules/mpm/dexter
-pipe -O2 -pedantic -Wall -Wshadow -Wpointer-arith -Wcast-align
-Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline
-Wno-long-long -funsigned-char -DTARGET=\"apache\" -DUSE_EXPAT
-I../../../lib/expat-lite `../../../apaci` dexter.c
dexter.c:188: warning: no previous prototype for `clean_child_exit'
dexter.c:491: warning: no previous prototype for `ap_start_shutdown'
dexter.c:504: warning: no previous prototype for `ap_start_restart'
dexter.c:682: warning: declaration of `pconf' shadows global declaration
dexter.c: In function `setup_listeners':
dexter.c:683: warning: declaration of `pconf' shadows global declaration
dexter.c: In function `process_socket':
dexter.c:744: warning: pointer targets in passing arg 3 of `getsockname'
differ in signedness
dexter.c: In function `worker_thread':
dexter.c:932: warning: pointer targets in passing arg 3 of `accept' differ in
signedness
dexter.c: In function `ap_mpm_run':
dexter.c:1365: warning: declaration of `i' shadows previous local
dexter.c: At top level:
dexter.c:1404: warning: declaration of `pconf' shadows global declaration
dexter.c: In function `dexter_pre_config':
dexter.c:1405: warning: declaration of `pconf' shadows global declaration

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

diff --git a/server/mpm/dexter/dexter.c b/server/mpm/dexter/dexter.c
index 92ea865e4fa3b89fcdb88d5cb00ea7a7b0fac73d..da1cc26d746c88d1ff9195bc1ca7cd310a4810c7 100644 (file)
--- a/server/mpm/dexter/dexter.c
+++ b/server/mpm/dexter/dexter.c
@@ -184,7 +184,7 @@ API_EXPORT(const server_rec *) ap_get_server_conf(void)
 
 /* a clean exit from a child with proper cleanup 
    static void clean_child_exit(int code) __attribute__ ((noreturn)); */
-void clean_child_exit(int code)
+static void clean_child_exit(int code)
 {
     if (pchild) {
        ap_destroy_pool(pchild);
@@ -487,7 +487,7 @@ static int volatile is_graceful;
  * child to force an exit) and so do an exit anyway.
  */
 
-void ap_start_shutdown(void)
+static void ap_start_shutdown(void)
 {
     if (shutdown_pending == 1) {
        /* Um, is this _probably_ not an error, if the user has
@@ -500,7 +500,7 @@ void ap_start_shutdown(void)
 }
 
 /* do a graceful restart if graceful == 1 */
-void ap_start_restart(int graceful)
+static void ap_start_restart(int graceful)
 {
 
     if (restart_pending == 1) {
@@ -679,12 +679,12 @@ static void process_child_status(int pid, ap_wait_t status)
     }
 }
 
-static int setup_listeners(pool *pconf, server_rec *s)
+static int setup_listeners(pool *p, server_rec *s)
 {
     ap_listen_rec *lr;
     int num_listeners = 0;
 
-    if (ap_listen_open(pconf, s->port)) {
+    if (ap_listen_open(p, s->port)) {
        return 0;
     }
     for (lr = ap_listeners; lr; lr = lr->next) {
@@ -736,7 +736,7 @@ static void process_socket(pool *p, struct sockaddr *sa_client, int csd,
                            int conn_id)
 {
     struct sockaddr sa_server; /* ZZZZ */
-    size_t len = sizeof(struct sockaddr);
+    NET_SIZE_T len = sizeof(struct sockaddr);
     BUFF *conn_io;
     conn_rec *current_conn;
     ap_iol *iol;
@@ -850,7 +850,7 @@ static void *worker_thread(void *arg)
     int sd = -1;
     int srv;
     int curr_pollfd, last_pollfd = 0;
-    size_t len = sizeof(struct sockaddr);
+    NET_SIZE_T len = sizeof(struct sockaddr);
     int thread_just_started = 1;
     int thread_num = *((int *) arg);
     long conn_id = child_num * HARD_THREAD_LIMIT + thread_num;
@@ -1362,7 +1362,6 @@ int ap_mpm_run(pool *_pconf, pool *plog, server_rec *s)
     }
 
     if (is_graceful) {
-       int i;
         char char_of_death = '!';
 
        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, server_conf,
@@ -1401,7 +1400,7 @@ int ap_mpm_run(pool *_pconf, pool *plog, server_rec *s)
     return 0;
 }
 
-static void dexter_pre_config(pool *pconf, pool *plog, pool *ptemp)
+static void dexter_pre_config(pool *p, pool *plog, pool *ptemp)
 {
     static int restart_num = 0;