You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rp...@apache.org on 2012/08/03 09:48:55 UTC
svn commit: r1368820 - in /apr/apr/branches/1.5.x: ./ tables/apr_tables.c
Author: rpluem
Date: Fri Aug 3 07:48:55 2012
New Revision: 1368820
URL: http://svn.apache.org/viewvc?rev=1368820&view=rev
Log:
Merge r1368819 from trunk:
* We only need the pool variable in the debug case.
Submitted by: rpluem
Modified:
apr/apr/branches/1.5.x/ (props changed)
apr/apr/branches/1.5.x/tables/apr_tables.c
Propchange: apr/apr/branches/1.5.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1368819
Modified: apr/apr/branches/1.5.x/tables/apr_tables.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.5.x/tables/apr_tables.c?rev=1368820&r1=1368819&r2=1368820&view=diff
==============================================================================
--- apr/apr/branches/1.5.x/tables/apr_tables.c (original)
+++ apr/apr/branches/1.5.x/tables/apr_tables.c Fri Aug 3 07:48:55 2012
@@ -730,11 +730,11 @@ APR_DECLARE(void) apr_table_mergen(apr_t
apr_table_entry_t *next_elt;
apr_table_entry_t *end_elt;
apr_uint32_t checksum;
- apr_pool_t *pool;
int hash;
#if APR_POOL_DEBUG
{
+ apr_pool_t *pool;
pool = apr_pool_find(key);
if ((pool != key) && (!apr_pool_is_ancestor(pool, t->a.pool))) {
fprintf(stderr, "apr_table_mergen: key not in ancestor pool of t\n");