Remove some useless declarations that were shadowing other local

variables of the same name.

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

diff --git a/modules/aaa/mod_authz_core.c b/modules/aaa/mod_authz_core.c
index 9b7173c8a84051c88c1e9a9f780ac95bc0a286c5..c9ed22ff1cf162b77b51e522b31ecaa119bc2e87 100644 (file)
--- a/modules/aaa/mod_authz_core.c
+++ b/modules/aaa/mod_authz_core.c
@@ -314,7 +314,7 @@ static const char *authz_require_alias_section(cmd_parms *cmd, void *mconfig,
                                 provider_name);
         }
         if (prvdraliasrec->provider->parse_require_line) {
-            const char *err = prvdraliasrec->provider->parse_require_line(cmd,
+            err = prvdraliasrec->provider->parse_require_line(cmd,
                          provider_args, &prvdraliasrec->provider_parsed_args);
             if (err)
                 return apr_psprintf(cmd->pool,

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 7523accbfff2be18a7ee4d564a8ee55df4103d41..6526e8ae4d9edd7a449bfe0f604ae27562e63422 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -1037,8 +1037,6 @@ read_request:
             return;
     }
     else if (cs->pub.state == CONN_STATE_CHECK_REQUEST_LINE_READABLE) {
-        apr_status_t rc;
-
         /* It greatly simplifies the logic to use a single timeout value here
          * because the new element can just be added to the end of the list and
          * it will stay sorted in expiration time sequence.  If brand new

diff --git a/server/mpm/event/fdqueue.c b/server/mpm/event/fdqueue.c
index f4253de343b9f49c4934b2e85ce5cd124f457d17..2751ae4e2403e2ec2c6064ebfbbea8eb457a7219 100644 (file)
--- a/server/mpm/event/fdqueue.c
+++ b/server/mpm/event/fdqueue.c
@@ -17,11 +17,11 @@
 #include "fdqueue.h"
 #include "apr_atomic.h"
 
-typedef struct recycled_pool
+struct recycled_pool
 {
     apr_pool_t *pool;
     struct recycled_pool *next;
-} recycled_pool;
+};
 
 struct fd_queue_info_t
 {
@@ -36,7 +36,7 @@ struct fd_queue_info_t
     int max_idlers;
     int max_recycled_pools;
     apr_uint32_t recycled_pools_count;
-    recycled_pool *recycled_pools;
+    struct recycled_pool *recycled_pools;
 };
 
 static apr_status_t queue_info_cleanup(void *data_)

diff --git a/server/skiplist.c b/server/skiplist.c
index 481ccb848d479e6564e9931c78b2dddedfe7c029..f31e7b90a02a5b4fb2a54ad202ca8c96d7cfb03c 100644 (file)
--- a/server/skiplist.c
+++ b/server/skiplist.c
@@ -368,7 +368,7 @@ AP_DECLARE(ap_skiplistnode *) ap_skiplist_insert_compare(ap_skiplist *sl, void *
          * this is a external insertion, we must insert into each index as
          * well
          */
-        ap_skiplistnode *p, *ni, *li;
+        ap_skiplistnode *ni, *li;
         li = ret;
         for (p = ap_skiplist_getlist(sl->index); p; ap_skiplist_next(sl->index, &p)) {
             ni = ap_skiplist_insert((ap_skiplist *) p->data, ret->data);

diff --git a/server/util_regex.c b/server/util_regex.c
index 73eccec761d439eeaa1dd91515555703d832712d..9dcfc468248ecd44342da00da5b229ebd89c3653 100644 (file)
--- a/server/util_regex.c
+++ b/server/util_regex.c
@@ -162,7 +162,6 @@ AP_DECLARE(int) ap_rxplus_exec(apr_pool_t *pool, ap_rxplus_t *rx,
         remainder = pattern + startl + oldl;
         if (rx->flags & AP_REG_MULTI) {
             /* recurse to do any further matches */
-            char *subs;
             ret += ap_rxplus_exec(pool, rx, remainder, &subs);
             if (ret > 1) {
                 /* a further substitution happened */