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 2012/10/18 16:53:04 UTC
svn commit: r1399685 -
/subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c
Author: stsp
Date: Thu Oct 18 14:53:04 2012
New Revision: 1399685
URL: http://svn.apache.org/viewvc?rev=1399685&view=rev
Log:
In the tree conflict editor, remove unused result pools from several functions.
* subversion/libsvn_wc/tree_conflict_editor.c
(update_moved_away_file, update_moved_away_dir,
update_moved_away_subtree): Remove unnecessary result_pool parameters.
(update_moved_away_subtree, drive_tree_conflict_editor): Update callers.
Modified:
subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c?rev=1399685&r1=1399684&r2=1399685&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c Thu Oct 18 14:53:04 2012
@@ -386,7 +386,6 @@ update_moved_away_file(svn_editor_t *tc_
const char *moved_to_abspath,
const char *move_dst_op_root_abspath,
svn_wc__db_t *db,
- apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
@@ -453,7 +452,6 @@ update_moved_away_dir(svn_editor_t *tc_e
const char *moved_to_abspath,
const char *move_dst_op_root_abspath,
svn_wc__db_t *db,
- apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
/* ### notify */
@@ -471,7 +469,6 @@ update_moved_away_subtree(svn_editor_t *
const char *moved_to_abspath,
const char *move_dst_op_root_abspath,
svn_wc__db_t *db,
- apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
const apr_array_header_t *children;
@@ -479,8 +476,7 @@ update_moved_away_subtree(svn_editor_t *
int i;
SVN_ERR(update_moved_away_dir(tc_editor, src_abspath, moved_to_abspath,
- move_dst_op_root_abspath, db, result_pool,
- scratch_pool));
+ move_dst_op_root_abspath, db, scratch_pool));
SVN_ERR(svn_wc__db_base_get_children(&children, db, src_abspath,
scratch_pool, scratch_pool));
@@ -516,12 +512,12 @@ update_moved_away_subtree(svn_editor_t *
SVN_ERR(update_moved_away_file(tc_editor, child_abspath,
child_moved_to_abspath,
move_dst_op_root_abspath,
- db, result_pool, iterpool));
+ db, iterpool));
else if (child_kind == svn_kind_dir)
SVN_ERR(update_moved_away_subtree(tc_editor, child_abspath,
child_moved_to_abspath,
move_dst_op_root_abspath,
- db, result_pool, iterpool));
+ db, iterpool));
}
svn_pool_destroy(iterpool);
@@ -566,12 +562,10 @@ drive_tree_conflict_editor(svn_editor_t
*/
if (old_version->node_kind == svn_node_file)
SVN_ERR(update_moved_away_file(tc_editor, src_abspath, dst_abspath,
- dst_abspath, db, scratch_pool,
- scratch_pool));
+ dst_abspath, db, scratch_pool));
else if (old_version->node_kind == svn_node_dir)
SVN_ERR(update_moved_away_subtree(tc_editor, src_abspath, dst_abspath,
- dst_abspath, db, scratch_pool,
- scratch_pool));
+ dst_abspath, db, scratch_pool));
SVN_ERR(svn_editor_complete(tc_editor));