You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2012/11/16 00:14:09 UTC
svn commit: r1410105 - in /subversion/branches/tree-read-api/subversion:
include/svn_tree.h libsvn_subr/tree.c
Author: julianfoad
Date: Thu Nov 15 23:14:09 2012
New Revision: 1410105
URL: http://svn.apache.org/viewvc?rev=1410105&view=rev
Log:
On the 'tree-read-api' branch: a bit of renaming.
* subversion/include/svn_tree.h
(svn_tree_node_read_dir): Rename 'dirents' to 'children' for consistency.
* subversion/libsvn_subr/tree.c
(walk_tree): Same.
Modified:
subversion/branches/tree-read-api/subversion/include/svn_tree.h
subversion/branches/tree-read-api/subversion/libsvn_subr/tree.c
Modified: subversion/branches/tree-read-api/subversion/include/svn_tree.h
URL: http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/include/svn_tree.h?rev=1410105&r1=1410104&r2=1410105&view=diff
==============================================================================
--- subversion/branches/tree-read-api/subversion/include/svn_tree.h (original)
+++ subversion/branches/tree-read-api/subversion/include/svn_tree.h Thu Nov 15 23:14:09 2012
@@ -187,7 +187,7 @@ svn_tree_node_read_file(svn_tree_node_t
/** Fetch the entries and/or properties of the directory @a tree_node.
*
- * If @a dirents is non-NULL, set @a *dirents to contain all the entries
+ * If @a children is non-NULL, set @a *children to contain all the entries
* of the directory @a tree_node. The hash maps (const char *) entry
* basenames to (svn_tree_node_t *) values.
*
@@ -201,7 +201,7 @@ svn_tree_node_read_file(svn_tree_node_t
*/
svn_error_t *
svn_tree_node_read_dir(svn_tree_node_t *node,
- apr_hash_t **dirents,
+ apr_hash_t **children,
apr_hash_t **props,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
Modified: subversion/branches/tree-read-api/subversion/libsvn_subr/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/libsvn_subr/tree.c?rev=1410105&r1=1410104&r2=1410105&view=diff
==============================================================================
--- subversion/branches/tree-read-api/subversion/libsvn_subr/tree.c (original)
+++ subversion/branches/tree-read-api/subversion/libsvn_subr/tree.c Thu Nov 15 23:14:09 2012
@@ -110,21 +110,21 @@ walk_tree(svn_tree_node_t *node,
/* Recurse */
if (kind == svn_node_dir && depth >= svn_depth_files)
{
- apr_hash_t *dirents;
- apr_array_header_t *dirents_sorted;
+ apr_hash_t *children;
+ apr_array_header_t *children_sorted;
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
int i;
- SVN_ERR(svn_tree_node_read_dir(node, &dirents, NULL /* props */,
+ SVN_ERR(svn_tree_node_read_dir(node, &children, NULL /* props */,
scratch_pool, scratch_pool));
- dirents_sorted = svn_sort__hash(dirents,
- svn_sort_compare_items_lexically,
- scratch_pool);
+ children_sorted = svn_sort__hash(children,
+ svn_sort_compare_items_lexically,
+ scratch_pool);
- for (i = 0; i < dirents_sorted->nelts; i++)
+ for (i = 0; i < children_sorted->nelts; i++)
{
const svn_sort__item_t *item
- = &APR_ARRAY_IDX(dirents_sorted, i, svn_sort__item_t);
+ = &APR_ARRAY_IDX(children_sorted, i, svn_sort__item_t);
svn_tree_node_t *child = item->value;
svn_node_kind_t child_kind;