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/19 21:18:03 UTC
svn commit: r1411391 - in /subversion/branches/tree-read-api/subversion:
include/private/svn_tree_impl.h libsvn_subr/disk_trees.c libsvn_subr/tree.c
Author: julianfoad
Date: Mon Nov 19 20:18:02 2012
New Revision: 1411391
URL: http://svn.apache.org/viewvc?rev=1411391&view=rev
Log:
On the 'tree-read-api' branch: Rename some functions for consistency.
* subversion/include/private/svn_tree_impl.h
(svn_tree_node__vtable_t): Rename 'get_file' to 'read_file'.
* subversion/libsvn_subr/tree.c
(svn_tree_node_read_file): Track the rename.
* subversion/libsvn_subr/disk_trees.c
(disk_treen_get_file, disk_treen_get_dir): Rename to disk_treen_read_*.
Modified:
subversion/branches/tree-read-api/subversion/include/private/svn_tree_impl.h
subversion/branches/tree-read-api/subversion/libsvn_subr/disk_trees.c
subversion/branches/tree-read-api/subversion/libsvn_subr/tree.c
Modified: subversion/branches/tree-read-api/subversion/include/private/svn_tree_impl.h
URL: http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/include/private/svn_tree_impl.h?rev=1411391&r1=1411390&r2=1411391&view=diff
==============================================================================
--- subversion/branches/tree-read-api/subversion/include/private/svn_tree_impl.h (original)
+++ subversion/branches/tree-read-api/subversion/include/private/svn_tree_impl.h Mon Nov 19 20:18:02 2012
@@ -81,19 +81,19 @@ typedef struct svn_tree_node__vtable_t
svn_node_kind_t *kind,
apr_pool_t *scratch_pool);
- /* See svn_tree_node_get_file(). */
- svn_error_t *(*get_file)(svn_tree_node_t *node,
- svn_stream_t **stream,
+ /* See svn_tree_node_read_file(). */
+ svn_error_t *(*read_file)(svn_tree_node_t *node,
+ svn_stream_t **stream,
+ apr_hash_t **props,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
+
+ /* See svn_tree_node_read_dir(). */
+ svn_error_t *(*read_dir)(svn_tree_node_t *node,
+ apr_hash_t **children,
apr_hash_t **props,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-
- /* See svn_tree_node_get_dir(). */
- svn_error_t *(*read_dir)(svn_tree_node_t *node,
- apr_hash_t **children,
- apr_hash_t **props,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
} svn_tree_node__vtable_t;
/** The implementation of the typedef #svn_tree_t. */
Modified: subversion/branches/tree-read-api/subversion/libsvn_subr/disk_trees.c
URL: http://svn.apache.org/viewvc/subversion/branches/tree-read-api/subversion/libsvn_subr/disk_trees.c?rev=1411391&r1=1411390&r2=1411391&view=diff
==============================================================================
--- subversion/branches/tree-read-api/subversion/libsvn_subr/disk_trees.c (original)
+++ subversion/branches/tree-read-api/subversion/libsvn_subr/disk_trees.c Mon Nov 19 20:18:02 2012
@@ -94,11 +94,11 @@ disk_treen_get_kind(svn_tree_node_t *nod
/* */
static svn_error_t *
-disk_treen_get_file(svn_tree_node_t *node,
- svn_stream_t **stream,
- apr_hash_t **props,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+disk_treen_read_file(svn_tree_node_t *node,
+ svn_stream_t **stream,
+ apr_hash_t **props,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
disk_tree_node_baton_t *nb = node->priv;
const char *abspath = svn_dirent_join(nb->tb->tree_abspath,
@@ -119,11 +119,11 @@ disk_treen_get_file(svn_tree_node_t *nod
* auto-props, etc. like "svn add" does.
*/
static svn_error_t *
-disk_treen_get_dir(svn_tree_node_t *node,
- apr_hash_t **children_p,
- apr_hash_t **props,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+disk_treen_read_dir(svn_tree_node_t *node,
+ apr_hash_t **children_p,
+ apr_hash_t **props,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
disk_tree_node_baton_t *nb = node->priv;
const char *abspath = svn_dirent_join(nb->tb->tree_abspath,
@@ -170,8 +170,8 @@ static const svn_tree_node__vtable_t dis
{
disk_treen_get_relpath,
disk_treen_get_kind,
- disk_treen_get_file,
- disk_treen_get_dir
+ disk_treen_read_file,
+ disk_treen_read_dir
};
/* */
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=1411391&r1=1411390&r2=1411391&view=diff
==============================================================================
--- subversion/branches/tree-read-api/subversion/libsvn_subr/tree.c (original)
+++ subversion/branches/tree-read-api/subversion/libsvn_subr/tree.c Mon Nov 19 20:18:02 2012
@@ -457,7 +457,7 @@ svn_tree_node_read_file(svn_tree_node_t
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- return node->vtable->get_file(node, stream, props,
+ return node->vtable->read_file(node, stream, props,
result_pool, scratch_pool);
}