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 23:04:54 UTC

svn commit: r1652685 - in /subversion/trunk/subversion/libsvn_fs_x: dag.c tree.c

Author: stefan2
Date: Sat Jan 17 22:04:53 2015
New Revision: 1652685

URL: http://svn.apache.org/r1652685
Log:
Follow-up to r1652683: Fix build by updating forgotten callers.

* subversion/libsvn_fs_x/dag.c
  (delete_if_mutable): Provide a scratch pool to svn_fs_x__dag_dir_entries.

* subversion/libsvn_fs_x/tree.c
  (x_dir_entries): Same.

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

Modified: subversion/trunk/subversion/libsvn_fs_x/dag.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.c?rev=1652685&r1=1652684&r2=1652685&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/dag.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/dag.c Sat Jan 17 22:04:53 2015
@@ -833,7 +833,8 @@ delete_if_mutable(svn_fs_t *fs,
       apr_pool_t *iterpool = svn_pool_create(scratch_pool);
 
       /* Loop over directory entries */
-      SVN_ERR(svn_fs_x__dag_dir_entries(&entries, node, scratch_pool));
+      SVN_ERR(svn_fs_x__dag_dir_entries(&entries, node, scratch_pool,
+                                        iterpool));
       for (i = 0; i < entries->nelts; ++i)
         {
           const svn_fs_x__id_t *noderev_id

Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1652685&r1=1652684&r2=1652685&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Sat Jan 17 22:04:53 2015
@@ -2371,7 +2371,8 @@ x_dir_entries(apr_hash_t **table_p,
 
   /* Get the entries for this path in the caller's pool. */
   SVN_ERR(get_dag(&node, root, path, scratch_pool));
-  SVN_ERR(svn_fs_x__dag_dir_entries(&table, node, scratch_pool));
+  SVN_ERR(svn_fs_x__dag_dir_entries(&table, node, scratch_pool,
+                                    scratch_pool));
 
   if (table->nelts)
     context = svn_fs_x__id_create_context(root->fs, pool);