You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/01/17 21:50:56 UTC

svn commit: r1652673 - /subversion/trunk/subversion/libsvn_fs_x/tree.c

Author: stefan2
Date: Sat Jan 17 20:50:56 2015
New Revision: 1652673

URL: http://svn.apache.org/r1652673
Log:
* subversion/libsvn_fs_x/tree.c
  (increment_mergeinfo_up_tree): As per our pool usage pattern, loops
                                 shall use ITERPOOLs. Fit it here.

Modified:
    subversion/trunk/subversion/libsvn_fs_x/tree.c

Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1652673&r1=1652672&r2=1652673&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Sat Jan 17 20:50:56 2015
@@ -1500,11 +1500,17 @@ increment_mergeinfo_up_tree(parent_path_
                             apr_int64_t increment,
                             apr_pool_t *scratch_pool)
 {
+  apr_pool_t *iterpool = svn_pool_create(scratch_pool);
+
   for (; pp; pp = pp->parent)
-    SVN_ERR(svn_fs_x__dag_increment_mergeinfo_count(pp->node,
-                                                    increment,
-                                                    scratch_pool));
+    {
+      svn_pool_clear(iterpool);
+      SVN_ERR(svn_fs_x__dag_increment_mergeinfo_count(pp->node,
+                                                      increment,
+                                                      iterpool));
+    }
 
+  svn_pool_destroy(iterpool);
   return SVN_NO_ERROR;
 }