From: Colm MacCarthaigh <colm@apache.org>
Date: Sun, 2 Oct 2005 21:32:29 +0000 (+0000)
Subject: Sync with trunk: remove an unneccessary over-lapping variable (jorton)
X-Git-Tag: 2.1.9~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0288158bacec323b9b802f77dab27332495cac5e;p=thirdparty%2Fapache%2Fhttpd.git

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 f95e0f61107..741df138ec6 100644
--- 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) {