From: Jim Jagielski <jim@apache.org>
Date: Sat, 28 Aug 1999 13:31:36 +0000 (+0000)
Subject: Remove some shadowing
X-Git-Tag: 1.3.10~352
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b4a4499c2c2aac212602f60bfdc2e5ef63d27c4;p=apache

Remove some shadowing
warnings. Avoid some possible confusion as well :)


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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 1b8114aded..f9239dbc57 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -2514,11 +2514,11 @@ 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;
 
-    if (ap_listen_open(pconf, s->port)) {
+    if (ap_listen_open(p, s->port)) {
 	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ALERT, s,
 		    "no listening sockets available, shutting down");
 	return -1;
@@ -2752,7 +2752,7 @@ int ap_mpm_run(pool *_pconf, pool *plog, server_rec *s)
     return 0;
 }
 
-static void prefork_pre_config(pool *pconf, pool *plog, pool *ptemp)
+static void prefork_pre_config(pool *p, pool *plog, pool *ptemp)
 {
     static int restart_num = 0;