Skip to content
Browse files

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
  • Loading branch information...
1 parent c219c33 commit 065407c2b618179de4659b7fe2ef46e35b14f10c Stefan Fritsch committed
Showing with 5 additions and 8 deletions.
  1. +1 −1 modules/aaa/mod_authz_core.c
  2. +0 −2 server/mpm/event/event.c
  3. +3 −3 server/mpm/event/fdqueue.c
  4. +1 −1 server/skiplist.c
  5. +0 −1 server/util_regex.c
View
2 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,
View
2 server/mpm/event/event.c
@@ -1037,8 +1037,6 @@ static void process_socket(apr_thread_t *thd, apr_pool_t * p, apr_socket_t * soc
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
View
6 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_)
View
2 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);
View
1 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 */

0 comments on commit 065407c

Please sign in to comment.
Something went wrong with that request. Please try again.