apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r1368821 - in /apr/apr/branches/1.4.x: ./ tables/apr_tables.c
Date Fri, 03 Aug 2012 07:49:54 GMT
Author: rpluem
Date: Fri Aug  3 07:49:54 2012
New Revision: 1368821

URL: http://svn.apache.org/viewvc?rev=1368821&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.4.x/   (props changed)
    apr/apr/branches/1.4.x/tables/apr_tables.c

Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1368819

Modified: apr/apr/branches/1.4.x/tables/apr_tables.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/tables/apr_tables.c?rev=1368821&r1=1368820&r2=1368821&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/tables/apr_tables.c (original)
+++ apr/apr/branches/1.4.x/tables/apr_tables.c Fri Aug  3 07:49:54 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");



Mime
View raw message