Sync with trunk: remove an unneccessary over-lapping variable (jorton)

and fix a style nit (colm).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293170 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/listen.c b/server/listen.c
index f95e0f61107840f2a431f6334a06d09a0bb496bc..741df138ec6be400de43a6bd2490c6af2ccf4217 100644 (file)
--- a/server/listen.c
+++ b/server/listen.c
@@ -387,7 +387,7 @@ static int open_listeners(apr_pool_t *pool)
                 && lr->bind_addr->port == lr->next->bind_addr->port
                 && IS_IN6ADDR_ANY(lr->next->bind_addr)) {
                 /* Exchange lr and lr->next */
-                ap_listen_rec *next = lr->next;
+                next = lr->next;
                 lr->next = next->next;
                 next->next = lr;
                 if (previous) {
@@ -561,7 +561,8 @@ AP_DECLARE(int) ap_setup_listeners(server_rec *s)
     return num_listeners;
 }
 
-AP_DECLARE_NONSTD(void) ap_close_listeners(void) {
+AP_DECLARE_NONSTD(void) ap_close_listeners(void) 
+{
     ap_listen_rec *lr;
 
     for (lr = ap_listeners; lr; lr = lr->next) {