You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sf...@apache.org on 2013/03/31 22:16:08 UTC
svn commit: r1463046 - in /httpd/httpd/trunk: modules/aaa/mod_authz_core.c
server/mpm/event/event.c server/mpm/event/fdqueue.c server/skiplist.c
server/util_regex.c
Author: sf
Date: Sun Mar 31 20:16:07 2013
New Revision: 1463046
URL: http://svn.apache.org/r1463046
Log:
Remove some useless declarations that were shadowing other local
variables of the same name.
Modified:
httpd/httpd/trunk/modules/aaa/mod_authz_core.c
httpd/httpd/trunk/server/mpm/event/event.c
httpd/httpd/trunk/server/mpm/event/fdqueue.c
httpd/httpd/trunk/server/skiplist.c
httpd/httpd/trunk/server/util_regex.c
Modified: httpd/httpd/trunk/modules/aaa/mod_authz_core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_authz_core.c?rev=1463046&r1=1463045&r2=1463046&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_authz_core.c (original)
+++ httpd/httpd/trunk/modules/aaa/mod_authz_core.c Sun Mar 31 20:16:07 2013
@@ -314,7 +314,7 @@ static const char *authz_require_alias_s
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,
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1463046&r1=1463045&r2=1463046&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Sun Mar 31 20:16:07 2013
@@ -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
Modified: httpd/httpd/trunk/server/mpm/event/fdqueue.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/fdqueue.c?rev=1463046&r1=1463045&r2=1463046&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/fdqueue.c (original)
+++ httpd/httpd/trunk/server/mpm/event/fdqueue.c Sun Mar 31 20:16:07 2013
@@ -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_)
Modified: httpd/httpd/trunk/server/skiplist.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/skiplist.c?rev=1463046&r1=1463045&r2=1463046&view=diff
==============================================================================
--- httpd/httpd/trunk/server/skiplist.c (original)
+++ httpd/httpd/trunk/server/skiplist.c Sun Mar 31 20:16:07 2013
@@ -368,7 +368,7 @@ AP_DECLARE(ap_skiplistnode *) ap_skiplis
* 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);
Modified: httpd/httpd/trunk/server/util_regex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_regex.c?rev=1463046&r1=1463045&r2=1463046&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_regex.c (original)
+++ httpd/httpd/trunk/server/util_regex.c Sun Mar 31 20:16:07 2013
@@ -162,7 +162,6 @@ AP_DECLARE(int) ap_rxplus_exec(apr_pool_
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 */