www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-07-29 09:01:18 +03:00
Code Activity

Remove some useless declarations that were shadowing other local

Browse Source 
variables of the same name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1463046 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2013-03-31 20:16:07 +00:00
parent 979cd47257
commit 3742c77564
5 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/aaa/mod_authz_core.c
View File

@ -314,7 +314,7 @@ static const char *authz_require_alias_section(cmd_parms *cmd, void *mconfig,
provider_name); provider_name);
} }
if (prvdraliasrec->provider->parse_require_line) { 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); provider_args, &prvdraliasrec->provider_parsed_args);
if (err) if (err)
return apr_psprintf(cmd->pool, return apr_psprintf(cmd->pool,

2
server/mpm/event/event.c
View File

@ -1037,8 +1037,6 @@ read_request:
return; return;
} }
else if (cs->pub.state == CONN_STATE_CHECK_REQUEST_LINE_READABLE) { 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 /* 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 * 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 * it will stay sorted in expiration time sequence. If brand new

6
server/mpm/event/fdqueue.c
View File

@ -17,11 +17,11 @@
#include "fdqueue.h" #include "fdqueue.h"
#include "apr_atomic.h" #include "apr_atomic.h"
typedef struct recycled_pool struct recycled_pool
{ {
apr_pool_t *pool; apr_pool_t *pool;
struct recycled_pool *next; struct recycled_pool *next;
} recycled_pool; };
struct fd_queue_info_t struct fd_queue_info_t
{ {
@ -36,7 +36,7 @@ struct fd_queue_info_t
int max_idlers; int max_idlers;
int max_recycled_pools; int max_recycled_pools;
apr_uint32_t recycled_pools_count; apr_uint32_t recycled_pools_count;
recycled_pool *recycled_pools; struct recycled_pool *recycled_pools;
}; };
static apr_status_t queue_info_cleanup(void *data_) static apr_status_t queue_info_cleanup(void *data_)

2
server/skiplist.c
View File

@ -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 * this is a external insertion, we must insert into each index as
* well * well
*/ */
ap_skiplistnode *p, *ni, *li; ap_skiplistnode *ni, *li;
li = ret; li = ret;
for (p = ap_skiplist_getlist(sl->index); p; ap_skiplist_next(sl->index, &p)) { for (p = ap_skiplist_getlist(sl->index); p; ap_skiplist_next(sl->index, &p)) {
ni = ap_skiplist_insert((ap_skiplist *) p->data, ret->data); ni = ap_skiplist_insert((ap_skiplist *) p->data, ret->data);

1
server/util_regex.c
View File

@ -162,7 +162,6 @@ AP_DECLARE(int) ap_rxplus_exec(apr_pool_t *pool, ap_rxplus_t *rx,
remainder = pattern + startl + oldl; remainder = pattern + startl + oldl;
if (rx->flags & AP_REG_MULTI) { if (rx->flags & AP_REG_MULTI) {
/* recurse to do any further matches */ /* recurse to do any further matches */
char *subs;
ret += ap_rxplus_exec(pool, rx, remainder, &subs); ret += ap_rxplus_exec(pool, rx, remainder, &subs);
if (ret > 1) { if (ret > 1) {
/* a further substitution happened */ /* a further substitution happened */