rse 99/08/28 05:32:11
Modified: src/modules/mpm/dexter dexter.c
Log:
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
Revision Changes Path
1.31 +8 -9 apache-2.0/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- dexter.c 1999/08/27 22:16:17 1.30
+++ dexter.c 1999/08/28 12:32:11 1.31
@@ -184,7 +184,7 @@
/* 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 @@
* 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 @@
}
/* 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 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 @@
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 @@
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 @@
}
if (is_graceful) {
- int i;
char char_of_death = '!';
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, server_conf,
@@ -1401,7 +1400,7 @@
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;
