You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/02/19 17:17:47 UTC
svn commit: r1072371 - /subversion/trunk/subversion/libsvn_fs_fs/tree.c
Author: philip
Date: Sat Feb 19 16:17:47 2011
New Revision: 1072371
URL: http://svn.apache.org/viewvc?rev=1072371&view=rev
Log:
Adjust pool parameter names to match usual pattern.
* subversion/libsvn_fs_fs/tree.c
(crawl_directory_dag_for_mergeinfo, get_mergeinfo_for_path,
add_descendant_mergeinfo): Rename pool parameter to scratch_pool,
switch order with result_pool.
(get_mergeinfos_for_paths): Adjust calls.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/tree.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/tree.c?rev=1072371&r1=1072370&r2=1072371&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/tree.c Sat Feb 19 16:17:47 2011
@@ -3504,16 +3504,17 @@ crawl_directory_dag_for_mergeinfo(svn_fs
const char *this_path,
dag_node_t *dir_dag,
svn_mergeinfo_catalog_t result_catalog,
- apr_pool_t *pool,
- apr_pool_t *result_pool)
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
apr_hash_t *entries;
apr_hash_index_t *hi;
- apr_pool_t *iterpool = svn_pool_create(pool);
+ apr_pool_t *iterpool = svn_pool_create(scratch_pool);
- SVN_ERR(svn_fs_fs__dag_dir_entries(&entries, dir_dag, pool, pool));
+ SVN_ERR(svn_fs_fs__dag_dir_entries(&entries, dir_dag,
+ scratch_pool, scratch_pool));
- for (hi = apr_hash_first(pool, entries);
+ for (hi = apr_hash_first(scratch_pool, entries);
hi;
hi = apr_hash_next(hi))
{
@@ -3565,8 +3566,8 @@ crawl_directory_dag_for_mergeinfo(svn_fs
kid_path,
kid_dag,
result_catalog,
- iterpool,
- result_pool));
+ result_pool,
+ iterpool));
}
svn_pool_destroy(iterpool);
@@ -3614,19 +3615,19 @@ get_mergeinfo_for_path(svn_mergeinfo_t *
const char *path,
svn_mergeinfo_inheritance_t inherit,
svn_boolean_t validate_inherited_mergeinfo,
- apr_pool_t *pool,
- apr_pool_t *result_pool)
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
parent_path_t *parent_path, *nearest_ancestor;
apr_hash_t *proplist;
svn_string_t *mergeinfo_string;
- apr_pool_t *iterpool = svn_pool_create(pool);
+ apr_pool_t *iterpool = svn_pool_create(scratch_pool);
*mergeinfo = NULL;
- path = svn_fs__canonicalize_abspath(path, pool);
+ path = svn_fs__canonicalize_abspath(path, scratch_pool);
- SVN_ERR(open_path(&parent_path, rev_root, path, 0, NULL, pool));
+ SVN_ERR(open_path(&parent_path, rev_root, path, 0, NULL, scratch_pool));
if (inherit == svn_mergeinfo_nearest_ancestor && ! parent_path->parent)
return SVN_NO_ERROR;
@@ -3664,14 +3665,15 @@ get_mergeinfo_for_path(svn_mergeinfo_t *
}
}
- SVN_ERR(svn_fs_fs__dag_get_proplist(&proplist, nearest_ancestor->node, pool));
+ SVN_ERR(svn_fs_fs__dag_get_proplist(&proplist, nearest_ancestor->node,
+ scratch_pool));
mergeinfo_string = apr_hash_get(proplist, SVN_PROP_MERGEINFO,
APR_HASH_KEY_STRING);
if (!mergeinfo_string)
return svn_error_createf
(SVN_ERR_FS_CORRUPT, NULL,
_("Node-revision '%s@%ld' claims to have mergeinfo but doesn't"),
- parent_path_path(nearest_ancestor, pool), rev_root->rev);
+ parent_path_path(nearest_ancestor, scratch_pool), rev_root->rev);
if (nearest_ancestor == parent_path)
{
@@ -3692,17 +3694,17 @@ get_mergeinfo_for_path(svn_mergeinfo_t *
SVN_ERR(svn_mergeinfo_parse(&temp_mergeinfo,
mergeinfo_string->data,
- pool));
+ scratch_pool));
SVN_ERR(svn_mergeinfo_inheritable(&temp_mergeinfo,
temp_mergeinfo,
NULL, SVN_INVALID_REVNUM,
- SVN_INVALID_REVNUM, pool));
+ SVN_INVALID_REVNUM, scratch_pool));
SVN_ERR(append_to_merged_froms(mergeinfo,
temp_mergeinfo,
parent_path_relpath(parent_path,
nearest_ancestor,
- pool),
+ scratch_pool),
result_pool));
if (validate_inherited_mergeinfo)
@@ -3721,23 +3723,23 @@ static svn_error_t *
add_descendant_mergeinfo(svn_mergeinfo_catalog_t result_catalog,
svn_fs_root_t *root,
const char *path,
- apr_pool_t *pool,
- apr_pool_t *result_pool)
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
dag_node_t *this_dag;
svn_boolean_t go_down;
- SVN_ERR(get_dag(&this_dag, root, path, pool));
+ SVN_ERR(get_dag(&this_dag, root, path, scratch_pool));
SVN_ERR(svn_fs_fs__dag_has_descendants_with_mergeinfo(&go_down,
this_dag,
- pool));
+ scratch_pool));
if (go_down)
SVN_ERR(crawl_directory_dag_for_mergeinfo(root,
path,
this_dag,
result_catalog,
- pool,
- result_pool));
+ result_pool,
+ scratch_pool));
return SVN_NO_ERROR;
}
@@ -3770,13 +3772,13 @@ get_mergeinfos_for_paths(svn_fs_root_t *
SVN_ERR(get_mergeinfo_for_path(&path_mergeinfo, root, path,
inherit, validate_inherited_mergeinfo,
- iterpool, pool));
+ pool, iterpool));
if (path_mergeinfo)
apr_hash_set(result_catalog, path, APR_HASH_KEY_STRING,
path_mergeinfo);
if (include_descendants)
- SVN_ERR(add_descendant_mergeinfo(result_catalog, root, path, iterpool,
- pool));
+ SVN_ERR(add_descendant_mergeinfo(result_catalog, root, path, pool,
+ iterpool));
}
svn_pool_destroy(iterpool);