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/02 16:04:42 UTC
svn commit: r1649060 - in /subversion/trunk/subversion/libsvn_fs_x:
cached_data.c cached_data.h dag.c fs.h fs_id.c fs_x.c fs_x.h low_level.c
low_level.h noderevs.c noderevs.h pack.c temp_serializer.c
temp_serializer.h transaction.c transaction.h tree.c
Author: stefan2
Date: Fri Jan 2 15:04:41 2015
New Revision: 1649060
URL: http://svn.apache.org/r1649060
Log:
In FSX, continue renaming global structs to meet our coding guidelines.
This is part of a series of search-replace changes.
* subversion/libsvn_fs_x/fs.h
(node_revision_t): Rename to ...
(svn_fs_x__noderev_t): ... this. Shorten the name to match the typical
'noderev' variable names.
* subversion/libsvn_fs_x/cached_data.c
* subversion/libsvn_fs_x/cached_data.h
* subversion/libsvn_fs_x/dag.c
* subversion/libsvn_fs_x/fs_id.c
* subversion/libsvn_fs_x/fs_x.c
* subversion/libsvn_fs_x/fs_x.h
* subversion/libsvn_fs_x/low_level.c
* subversion/libsvn_fs_x/low_level.h
* subversion/libsvn_fs_x/noderevs.c
* subversion/libsvn_fs_x/noderevs.h
* subversion/libsvn_fs_x/pack.c
* subversion/libsvn_fs_x/temp_serializer.c
* subversion/libsvn_fs_x/temp_serializer.h
* subversion/libsvn_fs_x/transaction.c
* subversion/libsvn_fs_x/transaction.h
* subversion/libsvn_fs_x/tree.c
(): s/node_revision_t/svn_fs_x__noderev_t/g
Modified:
subversion/trunk/subversion/libsvn_fs_x/cached_data.c
subversion/trunk/subversion/libsvn_fs_x/cached_data.h
subversion/trunk/subversion/libsvn_fs_x/dag.c
subversion/trunk/subversion/libsvn_fs_x/fs.h
subversion/trunk/subversion/libsvn_fs_x/fs_id.c
subversion/trunk/subversion/libsvn_fs_x/fs_x.c
subversion/trunk/subversion/libsvn_fs_x/fs_x.h
subversion/trunk/subversion/libsvn_fs_x/low_level.c
subversion/trunk/subversion/libsvn_fs_x/low_level.h
subversion/trunk/subversion/libsvn_fs_x/noderevs.c
subversion/trunk/subversion/libsvn_fs_x/noderevs.h
subversion/trunk/subversion/libsvn_fs_x/pack.c
subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c
subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h
subversion/trunk/subversion/libsvn_fs_x/transaction.c
subversion/trunk/subversion/libsvn_fs_x/transaction.h
subversion/trunk/subversion/libsvn_fs_x/tree.c
Modified: subversion/trunk/subversion/libsvn_fs_x/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/cached_data.c?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/cached_data.c Fri Jan 2 15:04:41 2015
@@ -98,7 +98,7 @@ dgb__log_access(svn_fs_t *fs,
/* construct description if possible */
if (item_type == SVN_FS_X__ITEM_TYPE_NODEREV && item != NULL)
{
- node_revision_t *node = item;
+ svn_fs_x__noderev_t *node = item;
const char *data_rep
= node->data_rep
? apr_psprintf(scratch_pool, " d=%ld/%" APR_UINT64_T_FMT,
@@ -268,7 +268,7 @@ err_dangling_id(svn_fs_t *fs,
See svn_fs_x__get_node_revision, which wraps this and adds another
error. */
static svn_error_t *
-get_node_revision_body(node_revision_t **noderev_p,
+get_node_revision_body(svn_fs_x__noderev_t **noderev_p,
svn_fs_t *fs,
const svn_fs_x__id_t *id,
apr_pool_t *result_pool,
@@ -370,7 +370,7 @@ get_node_revision_body(node_revision_t *
}
svn_error_t *
-svn_fs_x__get_node_revision(node_revision_t **noderev_p,
+svn_fs_x__get_node_revision(svn_fs_x__noderev_t **noderev_p,
svn_fs_t *fs,
const svn_fs_x__id_t *id,
apr_pool_t *result_pool,
@@ -399,7 +399,7 @@ svn_fs_x__get_mergeinfo_count(apr_int64_
const svn_fs_x__id_t *id,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
/* If we want a full acccess log, we need to provide full data and
cannot take shortcuts here. */
@@ -2226,7 +2226,7 @@ cache_access_wrapper(void **out,
svn_error_t *
svn_fs_x__try_process_file_contents(svn_boolean_t *success,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
svn_fs_process_contents_func_t processor,
void* baton,
apr_pool_t *pool)
@@ -2302,7 +2302,7 @@ delta_read_md5_digest(void *baton)
*/
static svn_txdelta_stream_t *
get_storaged_delta_stream(rep_state_t *rep_state,
- node_revision_t *target,
+ svn_fs_x__noderev_t *target,
apr_pool_t *pool)
{
/* Create the delta read baton. */
@@ -2317,8 +2317,8 @@ get_storaged_delta_stream(rep_state_t *r
svn_error_t *
svn_fs_x__get_file_delta_stream(svn_txdelta_stream_t **stream_p,
svn_fs_t *fs,
- node_revision_t *source,
- node_revision_t *target,
+ svn_fs_x__noderev_t *source,
+ svn_fs_x__noderev_t *target,
apr_pool_t *pool)
{
svn_stream_t *source_stream, *target_stream;
@@ -2535,7 +2535,7 @@ read_dir_entries(apr_array_header_t *ent
static svn_error_t *
get_dir_contents(apr_array_header_t **entries,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -2588,7 +2588,7 @@ get_dir_contents(apr_array_header_t **en
static svn_cache__t *
locate_dir_cache(svn_fs_t *fs,
svn_fs_x__id_t *key,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *pool)
{
svn_fs_x__data_t *ffd = fs->fsap_data;
@@ -2620,7 +2620,7 @@ locate_dir_cache(svn_fs_t *fs,
svn_error_t *
svn_fs_x__rep_contents_dir(apr_array_header_t **entries_p,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -2662,7 +2662,7 @@ svn_fs_x__find_dir_entry(apr_array_heade
svn_error_t *
svn_fs_x__rep_contents_dir_entry(dirent_t **dirent,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
const char *name,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -2713,7 +2713,7 @@ svn_fs_x__rep_contents_dir_entry(dirent_
svn_error_t *
svn_fs_x__get_proplist(apr_hash_t **proplist_p,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *pool)
{
apr_hash_t *proplist;
@@ -3026,7 +3026,7 @@ block_read_changes_container(apr_array_h
}
static svn_error_t *
-block_read_noderev(node_revision_t **noderev_p,
+block_read_noderev(svn_fs_x__noderev_t **noderev_p,
svn_fs_t *fs,
svn_fs_x__revision_file_t *rev_file,
svn_fs_x__p2l_entry_t* entry,
@@ -3071,7 +3071,7 @@ block_read_noderev(node_revision_t **nod
}
static svn_error_t *
-block_read_noderevs_container(node_revision_t **noderev_p,
+block_read_noderevs_container(svn_fs_x__noderev_t **noderev_p,
svn_fs_t *fs,
svn_fs_x__revision_file_t *rev_file,
svn_fs_x__p2l_entry_t* entry,
@@ -3253,7 +3253,7 @@ block_read(void **result,
case SVN_FS_X__ITEM_TYPE_NODEREV:
if (ffd->node_revision_cache || is_result)
- SVN_ERR(block_read_noderev((node_revision_t **)&item,
+ SVN_ERR(block_read_noderev((svn_fs_x__noderev_t **)&item,
fs, revision_file,
entry, &key, is_result,
pool, iterpool));
@@ -3276,7 +3276,7 @@ block_read(void **result,
case SVN_FS_X__ITEM_TYPE_NODEREVS_CONT:
SVN_ERR(block_read_noderevs_container
- ((node_revision_t **)&item,
+ ((svn_fs_x__noderev_t **)&item,
fs, revision_file,
entry, wanted_sub_item,
is_result, pool, iterpool));
Modified: subversion/trunk/subversion/libsvn_fs_x/cached_data.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/cached_data.h?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/cached_data.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/cached_data.h Fri Jan 2 15:04:41 2015
@@ -34,7 +34,7 @@
/* Set *NODEREV_P to the node-revision for the node ID in FS. Do any
allocations in POOL. */
svn_error_t *
-svn_fs_x__get_node_revision(node_revision_t **noderev_p,
+svn_fs_x__get_node_revision(svn_fs_x__noderev_t **noderev_p,
svn_fs_t *fs,
const svn_fs_x__id_t *id,
apr_pool_t *result_pool,
@@ -109,7 +109,7 @@ svn_fs_x__get_representation_length(svn_
svn_error_t *
svn_fs_x__try_process_file_contents(svn_boolean_t *success,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
svn_fs_process_contents_func_t processor,
void* baton,
apr_pool_t *pool);
@@ -120,8 +120,8 @@ svn_fs_x__try_process_file_contents(svn_
svn_error_t *
svn_fs_x__get_file_delta_stream(svn_txdelta_stream_t **stream_p,
svn_fs_t *fs,
- node_revision_t *source,
- node_revision_t *target,
+ svn_fs_x__noderev_t *source,
+ svn_fs_x__noderev_t *target,
apr_pool_t *pool);
/* Set *ENTRIES to an apr_array_header_t of dirent structs that contain
@@ -131,7 +131,7 @@ svn_fs_x__get_file_delta_stream(svn_txde
svn_error_t *
svn_fs_x__rep_contents_dir(apr_array_header_t **entries_p,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
@@ -151,7 +151,7 @@ svn_fs_x__find_dir_entry(apr_array_heade
svn_error_t *
svn_fs_x__rep_contents_dir_entry(dirent_t **dirent,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
const char *name,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
@@ -162,7 +162,7 @@ svn_fs_x__rep_contents_dir_entry(dirent_
svn_error_t *
svn_fs_x__get_proplist(apr_hash_t **proplist,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *pool);
/* Fetch the list of change in revision REV in FS and return it in *CHANGES.
Modified: subversion/trunk/subversion/libsvn_fs_x/dag.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.c?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/dag.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/dag.c Fri Jan 2 15:04:41 2015
@@ -69,7 +69,7 @@ struct dag_node_t
this yourself, but you're probably better off just calling
`get_node_revision' and `set_node_revision', which take care of
things for you. */
- node_revision_t *node_revision;
+ svn_fs_x__noderev_t *node_revision;
/* The pool to allocate NODE_REVISION in. */
apr_pool_t *node_pool;
@@ -115,11 +115,11 @@ svn_fs_x__dag_set_fs(dag_node_t *node, s
/* Dup NODEREV and all associated data into POOL.
Leaves the id and is_fresh_txn_root fields as zero bytes. */
-static node_revision_t *
-copy_node_revision(node_revision_t *noderev,
+static svn_fs_x__noderev_t *
+copy_node_revision(svn_fs_x__noderev_t *noderev,
apr_pool_t *pool)
{
- node_revision_t *nr = apr_pmemdup(pool, noderev, sizeof(*noderev));
+ svn_fs_x__noderev_t *nr = apr_pmemdup(pool, noderev, sizeof(*noderev));
if (noderev->copyfrom_path)
nr->copyfrom_path = apr_pstrdup(pool, noderev->copyfrom_path);
@@ -147,13 +147,13 @@ copy_node_revision(node_revision_t *node
changes that never got committed. It's probably best not to change
the structure at all. */
static svn_error_t *
-get_node_revision(node_revision_t **noderev_p,
+get_node_revision(svn_fs_x__noderev_t **noderev_p,
dag_node_t *node)
{
/* If we've already got a copy, there's no need to read it in. */
if (! node->node_revision)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
apr_pool_t *scratch_pool = svn_pool_create(node->node_pool);
SVN_ERR(svn_fs_x__get_node_revision(&noderev, node->fs, &node->id,
@@ -173,7 +173,7 @@ svn_error_t *
svn_fs_x__dag_get_node_id(svn_fs_x__id_t *node_id,
dag_node_t *node)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
SVN_ERR(get_node_revision(&noderev, node));
*node_id = noderev->node_id;
@@ -186,7 +186,7 @@ svn_error_t *
svn_fs_x__dag_get_copy_id(svn_fs_x__id_t *copy_id,
dag_node_t *node)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
SVN_ERR(get_node_revision(&noderev, node));
*copy_id = noderev->copy_id;
@@ -214,7 +214,7 @@ svn_fs_x__dag_same_line_of_history(svn_b
dag_node_t *lhs,
dag_node_t *rhs)
{
- node_revision_t *lhs_noderev, *rhs_noderev;
+ svn_fs_x__noderev_t *lhs_noderev, *rhs_noderev;
SVN_ERR(get_node_revision(&lhs_noderev, lhs));
SVN_ERR(get_node_revision(&rhs_noderev, rhs));
@@ -238,7 +238,7 @@ svn_fs_x__dag_get_node(dag_node_t **node
apr_pool_t *pool)
{
dag_node_t *new_node;
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
/* Construct the node. */
new_node = apr_pcalloc(pool, sizeof(*new_node));
@@ -284,7 +284,7 @@ svn_error_t *
svn_fs_x__dag_get_predecessor_id(svn_fs_x__id_t *id_p,
dag_node_t *node)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
SVN_ERR(get_node_revision(&noderev, node));
*id_p = noderev->predecessor_id;
@@ -297,7 +297,7 @@ svn_error_t *
svn_fs_x__dag_get_predecessor_count(int *count,
dag_node_t *node)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
SVN_ERR(get_node_revision(&noderev, node));
*count = noderev->predecessor_count;
@@ -308,7 +308,7 @@ svn_error_t *
svn_fs_x__dag_get_mergeinfo_count(apr_int64_t *count,
dag_node_t *node)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
SVN_ERR(get_node_revision(&noderev, node));
*count = noderev->mergeinfo_count;
@@ -319,7 +319,7 @@ svn_error_t *
svn_fs_x__dag_has_mergeinfo(svn_boolean_t *has_mergeinfo,
dag_node_t *node)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
SVN_ERR(get_node_revision(&noderev, node));
*has_mergeinfo = noderev->has_mergeinfo;
@@ -330,7 +330,7 @@ svn_error_t *
svn_fs_x__dag_has_descendants_with_mergeinfo(svn_boolean_t *do_they,
dag_node_t *node)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
if (node->kind != svn_node_dir)
{
@@ -390,7 +390,7 @@ set_entry(dag_node_t *parent,
svn_fs_x__txn_id_t txn_id,
apr_pool_t *pool)
{
- node_revision_t *parent_noderev;
+ svn_fs_x__noderev_t *parent_noderev;
/* Get the parent's node-revision. */
SVN_ERR(get_node_revision(&parent_noderev, parent));
@@ -417,7 +417,7 @@ make_entry(dag_node_t **child_p,
svn_fs_x__txn_id_t txn_id,
apr_pool_t *pool)
{
- node_revision_t new_noderev, *parent_noderev;
+ svn_fs_x__noderev_t new_noderev, *parent_noderev;
/* Make sure that NAME is a single path component. */
if (! svn_path_is_single_path_component(name))
@@ -471,7 +471,7 @@ svn_fs_x__dag_dir_entries(apr_array_head
dag_node_t *node,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
SVN_ERR(get_node_revision(&noderev, node));
@@ -489,7 +489,7 @@ svn_fs_x__dag_dir_entry(dirent_t **diren
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
SVN_ERR(get_node_revision(&noderev, node));
if (noderev->kind != svn_node_dir)
@@ -534,7 +534,7 @@ svn_fs_x__dag_get_proplist(apr_hash_t **
dag_node_t *node,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
apr_hash_t *proplist = NULL;
SVN_ERR(get_node_revision(&noderev, node));
@@ -552,7 +552,7 @@ svn_fs_x__dag_set_proplist(dag_node_t *n
apr_hash_t *proplist,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
/* Sanity check: this node better be mutable! */
if (! svn_fs_x__dag_check_mutable(node))
@@ -577,7 +577,7 @@ svn_fs_x__dag_increment_mergeinfo_count(
apr_int64_t increment,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
/* Sanity check: this node better be mutable! */
if (! svn_fs_x__dag_check_mutable(node))
@@ -628,7 +628,7 @@ svn_fs_x__dag_set_has_mergeinfo(dag_node
svn_boolean_t has_mergeinfo,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
/* Sanity check: this node better be mutable! */
if (! svn_fs_x__dag_check_mutable(node))
@@ -751,7 +751,7 @@ svn_fs_x__dag_clone_child(dag_node_t **c
}
else
{
- node_revision_t *noderev, *parent_noderev;
+ svn_fs_x__noderev_t *noderev, *parent_noderev;
/* Go get a fresh NODE-REVISION for current child node. */
SVN_ERR(get_node_revision(&noderev, cur_entry));
@@ -811,7 +811,7 @@ svn_fs_x__dag_delete(dag_node_t *parent,
svn_fs_x__txn_id_t txn_id,
apr_pool_t *pool)
{
- node_revision_t *parent_noderev;
+ svn_fs_x__noderev_t *parent_noderev;
svn_fs_t *fs = parent->fs;
dirent_t *dirent;
apr_pool_t *subpool;
@@ -933,7 +933,7 @@ svn_fs_x__dag_get_contents(svn_stream_t
dag_node_t *file,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
svn_stream_t *contents;
/* Make sure our node is a file. */
@@ -961,8 +961,8 @@ svn_fs_x__dag_get_file_delta_stream(svn_
dag_node_t *target,
apr_pool_t *pool)
{
- node_revision_t *src_noderev;
- node_revision_t *tgt_noderev;
+ svn_fs_x__noderev_t *src_noderev;
+ svn_fs_x__noderev_t *tgt_noderev;
/* Make sure our nodes are files. */
if ((source && source->kind != svn_node_file)
@@ -991,7 +991,7 @@ svn_fs_x__dag_try_process_file_contents(
void* baton,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
/* Go get fresh node-revisions for the nodes. */
SVN_ERR(get_node_revision(&noderev, node));
@@ -1007,7 +1007,7 @@ svn_fs_x__dag_file_length(svn_filesize_t
dag_node_t *file,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
/* Make sure our node is a file. */
if (file->kind != svn_node_file)
@@ -1028,7 +1028,7 @@ svn_fs_x__dag_file_checksum(svn_checksum
svn_checksum_kind_t kind,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
if (file->kind != svn_node_file)
return svn_error_createf
@@ -1046,7 +1046,7 @@ svn_fs_x__dag_get_edit_stream(svn_stream
dag_node_t *file,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
svn_stream_t *ws;
/* Make sure our node is a file. */
@@ -1102,7 +1102,7 @@ svn_fs_x__dag_dup(const dag_node_t *node
dag_node_t *new_node = apr_pmemdup(pool, node, sizeof(*new_node));
new_node->created_path = apr_pstrdup(pool, node->created_path);
- /* Only copy cached node_revision_t for immutable nodes. */
+ /* Only copy cached svn_fs_x__noderev_t for immutable nodes. */
if (node->node_revision && !svn_fs_x__dag_check_mutable(node))
new_node->node_revision = copy_node_revision(node->node_revision, pool);
else
@@ -1229,7 +1229,7 @@ svn_fs_x__dag_copy(dag_node_t *to_node,
if (preserve_history)
{
- node_revision_t *from_noderev, *to_noderev;
+ svn_fs_x__noderev_t *from_noderev, *to_noderev;
svn_fs_x__id_t copy_id;
svn_fs_t *fs = svn_fs_x__dag_get_fs(from_node);
@@ -1280,7 +1280,7 @@ svn_fs_x__dag_things_different(svn_boole
svn_boolean_t strict,
apr_pool_t *pool)
{
- node_revision_t *noderev1, *noderev2;
+ svn_fs_x__noderev_t *noderev1, *noderev2;
svn_fs_t *fs;
svn_boolean_t same;
@@ -1316,7 +1316,7 @@ svn_fs_x__dag_get_copyroot(svn_revnum_t
const char **path,
dag_node_t *node)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
/* Go get a fresh node-revision for NODE. */
SVN_ERR(get_node_revision(&noderev, node));
@@ -1331,7 +1331,7 @@ svn_error_t *
svn_fs_x__dag_get_copyfrom_rev(svn_revnum_t *rev,
dag_node_t *node)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
/* Go get a fresh node-revision for NODE. */
SVN_ERR(get_node_revision(&noderev, node));
@@ -1345,7 +1345,7 @@ svn_error_t *
svn_fs_x__dag_get_copyfrom_path(const char **path,
dag_node_t *node)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
/* Go get a fresh node-revision for NODE. */
SVN_ERR(get_node_revision(&noderev, node));
@@ -1360,7 +1360,7 @@ svn_fs_x__dag_update_ancestry(dag_node_t
dag_node_t *source,
apr_pool_t *pool)
{
- node_revision_t *source_noderev, *target_noderev;
+ svn_fs_x__noderev_t *source_noderev, *target_noderev;
if (! svn_fs_x__dag_check_mutable(target))
return svn_error_createf
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Fri Jan 2 15:04:41 2015
@@ -473,7 +473,7 @@ typedef struct svn_fs_x__representation_
/*** Node-Revision ***/
/* If you add fields to this, check to see if you need to change
* copy_node_revision in dag.c. */
-typedef struct node_revision_t
+typedef struct svn_fs_x__noderev_t
{
/* node kind */
svn_node_kind_t kind;
@@ -525,7 +525,7 @@ typedef struct node_revision_t
/* Does this node itself have svn:mergeinfo? */
svn_boolean_t has_mergeinfo;
-} node_revision_t;
+} svn_fs_x__noderev_t;
/** The type of a directory entry. */
Modified: subversion/trunk/subversion/libsvn_fs_x/fs_id.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs_id.c?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs_id.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs_id.c Fri Jan 2 15:04:41 2015
@@ -163,10 +163,10 @@ get_aux_pool(const fs_x__id_t *id)
/* Return the noderev structure identified by ID. Returns NULL for invalid
IDs or inaccessible repositories. The caller should clear the auxiliary
pool before returning to its respective caller. */
-static node_revision_t *
+static svn_fs_x__noderev_t *
get_noderev(const fs_x__id_t *id)
{
- node_revision_t *result = NULL;
+ svn_fs_x__noderev_t *result = NULL;
svn_fs_x__id_context_t *context = id->generic_id.fsap_data;
svn_fs_t *fs = get_fs(context);
@@ -212,7 +212,7 @@ id_compare(const svn_fs_id_t *a,
{
const fs_x__id_t *id_a = (const fs_x__id_t *)a;
const fs_x__id_t *id_b = (const fs_x__id_t *)b;
- node_revision_t *noderev_a, *noderev_b;
+ svn_fs_x__noderev_t *noderev_a, *noderev_b;
svn_boolean_t same_node;
/* Quick check: same IDs? */
Modified: subversion/trunk/subversion/libsvn_fs_x/fs_x.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs_x.c?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs_x.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs_x.c Fri Jan 2 15:04:41 2015
@@ -681,7 +681,7 @@ svn_fs_x__revision_proplist(apr_hash_t *
svn_error_t *
svn_fs_x__file_length(svn_filesize_t *length,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *pool)
{
if (noderev->data_rep)
@@ -720,8 +720,8 @@ svn_fs_x__file_text_rep_equal(svn_fs_x__
svn_error_t *
svn_fs_x__prop_rep_equal(svn_boolean_t *equal,
svn_fs_t *fs,
- node_revision_t *a,
- node_revision_t *b,
+ svn_fs_x__noderev_t *a,
+ svn_fs_x__noderev_t *b,
svn_boolean_t strict,
apr_pool_t *scratch_pool)
{
@@ -776,7 +776,7 @@ svn_fs_x__prop_rep_equal(svn_boolean_t *
svn_error_t *
svn_fs_x__file_checksum(svn_checksum_t **checksum,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
svn_checksum_kind_t kind,
apr_pool_t *pool)
{
Modified: subversion/trunk/subversion/libsvn_fs_x/fs_x.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs_x.h?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs_x.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs_x.h Fri Jan 2 15:04:41 2015
@@ -81,7 +81,7 @@ svn_error_t *svn_fs_x__revision_proplist
/* Set *LENGTH to the be fulltext length of the node revision
specified by NODEREV. Use POOL for temporary allocations. */
svn_error_t *svn_fs_x__file_length(svn_filesize_t *length,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *pool);
/* Return TRUE if the representations in A and B have equal contents, else
@@ -95,8 +95,8 @@ svn_boolean_t svn_fs_x__file_text_rep_eq
Use SCRATCH_POOL for temporary allocations. */
svn_error_t *svn_fs_x__prop_rep_equal(svn_boolean_t *equal,
svn_fs_t *fs,
- node_revision_t *a,
- node_revision_t *b,
+ svn_fs_x__noderev_t *a,
+ svn_fs_x__noderev_t *b,
svn_boolean_t strict,
apr_pool_t *scratch_pool);
@@ -111,7 +111,7 @@ svn_fs_x__rep_copy(svn_fs_x__representat
of NODREV into CHECKSUM, allocating from POOL. If no stored checksum is
available, put all NULL into CHECKSUM. */
svn_error_t *svn_fs_x__file_checksum(svn_checksum_t **checksum,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
svn_checksum_kind_t kind,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/libsvn_fs_x/low_level.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/low_level.c?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/low_level.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/low_level.c Fri Jan 2 15:04:41 2015
@@ -423,13 +423,13 @@ read_id_part(svn_fs_x__id_t *id,
}
svn_error_t *
-svn_fs_x__read_noderev(node_revision_t **noderev_p,
+svn_fs_x__read_noderev(svn_fs_x__noderev_t **noderev_p,
svn_stream_t *stream,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
apr_hash_t *headers;
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
char *value;
const char *noderev_id;
@@ -625,7 +625,7 @@ svn_fs_x__unparse_representation(svn_fs_
svn_error_t *
svn_fs_x__write_noderev(svn_stream_t *outfile,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *scratch_pool)
{
svn_string_t *str_id;
Modified: subversion/trunk/subversion/libsvn_fs_x/low_level.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/low_level.h?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/low_level.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/low_level.h Fri Jan 2 15:04:41 2015
@@ -100,7 +100,7 @@ svn_fs_x__unparse_representation(svn_fs_
/* Read a node-revision from STREAM. Set *NODEREV to the new structure,
allocated in RESULT_POOL. */
svn_error_t *
-svn_fs_x__read_noderev(node_revision_t **noderev,
+svn_fs_x__read_noderev(svn_fs_x__noderev_t **noderev,
svn_stream_t *stream,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
@@ -109,7 +109,7 @@ svn_fs_x__read_noderev(node_revision_t *
Temporary allocations are from SCRATCH_POOL. */
svn_error_t *
svn_fs_x__write_noderev(svn_stream_t *outfile,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *scratch_pool);
/* This type enumerates all forms of representations that we support. */
Modified: subversion/trunk/subversion/libsvn_fs_x/noderevs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/noderevs.c?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/noderevs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/noderevs.c Fri Jan 2 15:04:41 2015
@@ -71,7 +71,7 @@ typedef struct binary_representation_t
svn_filesize_t expanded_size;
} binary_representation_t;
-/* Our internal representation of a node_revision_t.
+/* Our internal representation of a svn_fs_x__noderev_t.
*
* We will store path strings in a string container and reference them
* from here. Similarly, IDs and representations are being stored in
@@ -250,7 +250,7 @@ store_representation(apr_array_header_t
apr_size_t
svn_fs_x__noderevs_add(svn_fs_x__noderevs_t *container,
- node_revision_t *noderev)
+ svn_fs_x__noderev_t *noderev)
{
binary_noderev_t binary_noderev = { 0 };
@@ -396,12 +396,12 @@ get_representation(svn_fs_x__representat
}
svn_error_t *
-svn_fs_x__noderevs_get(node_revision_t **noderev_p,
+svn_fs_x__noderevs_get(svn_fs_x__noderev_t **noderev_p,
const svn_fs_x__noderevs_t *container,
apr_size_t idx,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
binary_noderev_t *binary_noderev;
/* CONTAINER must be in 'finalized' mode */
@@ -845,7 +845,7 @@ svn_fs_x__noderevs_get_func(void **out,
void *baton,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
binary_noderev_t *binary_noderev;
apr_array_header_t ids;
Modified: subversion/trunk/subversion/libsvn_fs_x/noderevs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/noderevs.h?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/noderevs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/noderevs.h Fri Jan 2 15:04:41 2015
@@ -33,7 +33,7 @@
*
* In its serialized form, the svn_fs_x__noderevs_t container extracts
* most of that redundancy and the run-time representation is also much
- * smaller than sum of the respective node_revision_t objects.
+ * smaller than sum of the respective svn_fs_x__noderev_t objects.
*
* As with other containers, this one has two modes: 'construction', in
* which you may add data to it, and 'getter' in which there is only r/o
@@ -47,7 +47,7 @@ typedef struct svn_fs_x__noderevs_t svn_
/* Create and populate noderev containers. */
/* Create and return a new noderevs container with an initial capacity of
- * INITIAL_COUNT node_revision_t objects. Allocate the result in POOL.
+ * INITIAL_COUNT svn_fs_x__noderev_t objects. Allocate the result in POOL.
*/
svn_fs_x__noderevs_t *
svn_fs_x__noderevs_create(int initial_count,
@@ -58,7 +58,7 @@ svn_fs_x__noderevs_create(int initial_co
*/
apr_size_t
svn_fs_x__noderevs_add(svn_fs_x__noderevs_t *container,
- node_revision_t *noderev);
+ svn_fs_x__noderev_t *noderev);
/* Return a rough estimate in bytes for the serialized representation
* of CONTAINER.
@@ -72,7 +72,7 @@ svn_fs_x__noderevs_estimate_size(const s
* the result in POOL and return it in *NODEREV_P.
*/
svn_error_t *
-svn_fs_x__noderevs_get(node_revision_t **noderev_p,
+svn_fs_x__noderevs_get(svn_fs_x__noderev_t **noderev_p,
const svn_fs_x__noderevs_t *container,
apr_size_t idx,
apr_pool_t *pool);
@@ -116,7 +116,7 @@ svn_fs_x__deserialize_noderevs_container
apr_pool_t *pool);
/* Implements svn_cache__partial_getter_func_t for svn_fs_x__noderevs_t,
- * setting *OUT to the node_revision_t selected by the apr_uint32_t index
+ * setting *OUT to the svn_fs_x__noderev_t selected by the apr_uint32_t index
* passed in as *BATON. This function is similar to svn_fs_x__noderevs_get
* but operates on the cache serialized representation of the container.
*/
Modified: subversion/trunk/subversion/libsvn_fs_x/pack.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/pack.c?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/pack.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/pack.c Fri Jan 2 15:04:41 2015
@@ -675,7 +675,7 @@ copy_node_to_temp(pack_context_t *contex
{
path_order_t *path_order = apr_pcalloc(context->info_pool,
sizeof(*path_order));
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
const char *sort_path;
apr_off_t source_offset = entry->offset;
@@ -1090,7 +1090,7 @@ store_nodes(pack_context_t *context,
apr_size_t pack_savings = 0;
for (i = 0; i < node_parts->nelts; ++i)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
svn_fs_x__p2l_entry_t *entry
= APR_ARRAY_IDX(node_parts, i, svn_fs_x__p2l_entry_t *);
Modified: subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c Fri Jan 2 15:04:41 2015
@@ -324,9 +324,9 @@ deserialize_dir(void *buffer, dir_data_t
void
svn_fs_x__noderev_serialize(svn_temp_serializer__context_t *context,
- node_revision_t * const *noderev_p)
+ svn_fs_x__noderev_t * const *noderev_p)
{
- const node_revision_t *noderev = *noderev_p;
+ const svn_fs_x__noderev_t *noderev = *noderev_p;
if (noderev == NULL)
return;
@@ -350,10 +350,10 @@ svn_fs_x__noderev_serialize(svn_temp_ser
void
svn_fs_x__noderev_deserialize(void *buffer,
- node_revision_t **noderev_p,
+ svn_fs_x__noderev_t **noderev_p,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
/* fixup the reference to the representation itself,
* if this is part of a parent structure. */
@@ -638,7 +638,7 @@ svn_fs_x__deserialize_properties(void **
return SVN_NO_ERROR;
}
-/** Caching node_revision_t objects. **/
+/** Caching svn_fs_x__noderev_t objects. **/
svn_error_t *
svn_fs_x__serialize_node_revision(void **buffer,
@@ -647,7 +647,7 @@ svn_fs_x__serialize_node_revision(void *
apr_pool_t *pool)
{
svn_stringbuf_t *serialized;
- node_revision_t *noderev = item;
+ svn_fs_x__noderev_t *noderev = item;
/* create an (empty) serialization context with plenty of (initial)
* buffer space. */
@@ -674,7 +674,7 @@ svn_fs_x__deserialize_node_revision(void
apr_pool_t *pool)
{
/* Copy the _full_ buffer as it also contains the sub-structures. */
- node_revision_t *noderev = (node_revision_t *)buffer;
+ svn_fs_x__noderev_t *noderev = (svn_fs_x__noderev_t *)buffer;
/* fixup of all pointers etc. */
svn_fs_x__noderev_deserialize(noderev, &noderev, pool);
Modified: subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h Fri Jan 2 15:04:41 2015
@@ -41,7 +41,7 @@ svn_fs_x__combine_number_and_string(apr_
*/
void
svn_fs_x__noderev_serialize(struct svn_temp_serializer__context_t *context,
- node_revision_t * const *noderev_p);
+ svn_fs_x__noderev_t * const *noderev_p);
/**
* Deserialize a @a noderev_p within the @a buffer and associate it with
@@ -49,7 +49,7 @@ svn_fs_x__noderev_serialize(struct svn_t
*/
void
svn_fs_x__noderev_deserialize(void *buffer,
- node_revision_t **noderev_p,
+ svn_fs_x__noderev_t **noderev_p,
apr_pool_t *pool);
/**
@@ -147,7 +147,7 @@ svn_fs_x__deserialize_properties(void **
apr_pool_t *pool);
/**
- * Implements #svn_cache__serialize_func_t for #node_revision_t
+ * Implements #svn_cache__serialize_func_t for #svn_fs_x__noderev_t
*/
svn_error_t *
svn_fs_x__serialize_node_revision(void **buffer,
@@ -156,7 +156,7 @@ svn_fs_x__serialize_node_revision(void *
apr_pool_t *pool);
/**
- * Implements #svn_cache__deserialize_func_t for #node_revision_t
+ * Implements #svn_cache__deserialize_func_t for #svn_fs_x__noderev_t
*/
svn_error_t *
svn_fs_x__deserialize_node_revision(void **item,
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Fri Jan 2 15:04:41 2015
@@ -746,7 +746,7 @@ purge_shared_txn(svn_fs_t *fs,
svn_error_t *
svn_fs_x__put_node_revision(svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
svn_boolean_t fresh_txn_root,
apr_pool_t *pool)
{
@@ -780,7 +780,7 @@ svn_fs_x__put_node_revision(svn_fs_t *fs
*/
static svn_error_t *
store_sha1_rep_mapping(svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *scratch_pool)
{
svn_fs_x__data_t *ffd = fs->fsap_data;
@@ -1129,7 +1129,7 @@ create_new_txn_noderev_from_rev(svn_fs_t
svn_fs_x__id_t *src,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
SVN_ERR(svn_fs_x__get_node_revision(&noderev, fs, src, pool, pool));
/* This must be a root node. */
@@ -1384,7 +1384,7 @@ svn_fs_x__get_txn(svn_fs_x__transaction_
apr_pool_t *pool)
{
svn_fs_x__transaction_t *txn;
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
svn_fs_x__id_t root_id;
txn = apr_pcalloc(pool, sizeof(*txn));
@@ -1592,7 +1592,7 @@ svn_fs_x__reserve_copy_id(svn_fs_x__id_t
svn_error_t *
svn_fs_x__create_node(svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
const svn_fs_x__id_t *copy_id,
svn_fs_x__txn_id_t txn_id,
apr_pool_t *pool)
@@ -1659,7 +1659,7 @@ svn_fs_x__abort_txn(svn_fs_txn_t *txn,
svn_error_t *
svn_fs_x__set_entry(svn_fs_t *fs,
svn_fs_x__txn_id_t txn_id,
- node_revision_t *parent_noderev,
+ svn_fs_x__noderev_t *parent_noderev,
const char *name,
const svn_fs_x__id_t *id,
svn_node_kind_t kind,
@@ -1819,7 +1819,7 @@ struct rep_write_baton
svn_filesize_t rep_size;
/* The node revision for which we're writing out info. */
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
/* Actual output file. */
apr_file_t *file;
@@ -1863,7 +1863,7 @@ rep_write_contents(void *baton,
static svn_error_t *
shards_spanned(int *spanned,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
int walk,
apr_pool_t *pool)
{
@@ -1901,7 +1901,7 @@ shards_spanned(int *spanned,
static svn_error_t *
choose_delta_base(svn_fs_x__representation_t **rep,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
svn_boolean_t props,
apr_pool_t *pool)
{
@@ -1912,7 +1912,7 @@ choose_delta_base(svn_fs_x__representati
* skip-delta bits for the high-order bits and are linear in the low-order
* bits.) */
int walk;
- node_revision_t *base;
+ svn_fs_x__noderev_t *base;
svn_fs_x__data_t *ffd = fs->fsap_data;
apr_pool_t *iterpool;
@@ -2057,7 +2057,7 @@ rep_write_cleanup(void *data)
static svn_error_t *
rep_write_get_baton(struct rep_write_baton **wb_p,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *pool)
{
svn_fs_x__data_t *ffd = fs->fsap_data;
@@ -2364,7 +2364,7 @@ rep_write_contents_close(void *baton)
static svn_error_t *
set_representation(svn_stream_t **contents_p,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *pool)
{
struct rep_write_baton *wb;
@@ -2387,7 +2387,7 @@ set_representation(svn_stream_t **conten
svn_error_t *
svn_fs_x__set_contents(svn_stream_t **stream,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *pool)
{
if (noderev->kind != svn_node_file)
@@ -2399,7 +2399,7 @@ svn_fs_x__set_contents(svn_stream_t **st
svn_error_t *
svn_fs_x__create_successor(svn_fs_t *fs,
- node_revision_t *new_noderev,
+ svn_fs_x__noderev_t *new_noderev,
const svn_fs_x__id_t *copy_id,
svn_fs_x__txn_id_t txn_id,
apr_pool_t *pool)
@@ -2424,7 +2424,7 @@ svn_fs_x__create_successor(svn_fs_t *fs,
svn_error_t *
svn_fs_x__set_proplist(svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_hash_t *proplist,
apr_pool_t *pool)
{
@@ -2540,7 +2540,7 @@ write_container_delta_rep(svn_fs_x__repr
collection_writer_t writer,
svn_fs_t *fs,
svn_fs_x__txn_id_t txn_id,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_hash_t *reps_hash,
apr_uint32_t item_type,
svn_revnum_t final_revision,
@@ -2676,7 +2676,7 @@ write_container_delta_rep(svn_fs_x__repr
*/
static svn_error_t *
validate_root_noderev(svn_fs_t *fs,
- node_revision_t *root_noderev,
+ svn_fs_x__noderev_t *root_noderev,
svn_revnum_t rev,
apr_pool_t *pool)
{
@@ -2688,7 +2688,7 @@ validate_root_noderev(svn_fs_t *fs,
/* Compute HEAD_PREDECESSOR_COUNT. */
{
svn_fs_x__id_t head_root_id;
- node_revision_t *head_root_noderev;
+ svn_fs_x__noderev_t *head_root_noderev;
/* Get /@HEAD's noderev. */
svn_fs_x__init_rev_root(&head_root_id, head_revnum);
@@ -2777,7 +2777,7 @@ write_final_rev(svn_fs_x__id_t *new_id_p
svn_boolean_t at_root,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
apr_off_t my_offset;
svn_fs_x__id_t new_id;
svn_fs_x__id_t noderev_id;
@@ -3566,7 +3566,7 @@ svn_fs_x__delete_node_revision(svn_fs_t
const svn_fs_x__id_t *id,
apr_pool_t *pool)
{
- node_revision_t *noderev;
+ svn_fs_x__noderev_t *noderev;
SVN_ERR(svn_fs_x__get_node_revision(&noderev, fs, id, pool, pool));
/* Delete any mutable property representation. */
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.h?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.h Fri Jan 2 15:04:41 2015
@@ -77,7 +77,7 @@ svn_fs_x__with_all_locks(svn_fs_t *fs,
any necessary temporary allocation in POOL. */
svn_error_t *
svn_fs_x__put_node_revision(svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
svn_boolean_t fresh_txn_root,
apr_pool_t *pool);
@@ -136,7 +136,7 @@ svn_fs_x__reserve_copy_id(svn_fs_x__id_t
which this occurs. */
svn_error_t *
svn_fs_x__create_node(svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
const svn_fs_x__id_t *copy_id,
svn_fs_x__txn_id_t txn_id,
apr_pool_t *pool);
@@ -160,7 +160,7 @@ svn_fs_x__abort_txn(svn_fs_txn_t *txn,
svn_error_t *
svn_fs_x__set_entry(svn_fs_t *fs,
svn_fs_x__txn_id_t txn_id,
- node_revision_t *parent_noderev,
+ svn_fs_x__noderev_t *parent_noderev,
const char *name,
const svn_fs_x__id_t *id,
svn_node_kind_t kind,
@@ -194,7 +194,7 @@ svn_fs_x__add_change(svn_fs_t *fs,
svn_error_t *
svn_fs_x__set_contents(svn_stream_t **stream,
svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_pool_t *pool);
/* Create a node revision in FS which is an immediate successor of
@@ -211,7 +211,7 @@ svn_fs_x__set_contents(svn_stream_t **st
nodes as deltas against this node's contents. */
svn_error_t *
svn_fs_x__create_successor(svn_fs_t *fs,
- node_revision_t *new_noderev,
+ svn_fs_x__noderev_t *new_noderev,
const svn_fs_x__id_t *copy_id,
svn_fs_x__txn_id_t txn_id,
apr_pool_t *pool);
@@ -220,7 +220,7 @@ svn_fs_x__create_successor(svn_fs_t *fs,
filesystem FS. Perform any temporary allocations in POOL. */
svn_error_t *
svn_fs_x__set_proplist(svn_fs_t *fs,
- node_revision_t *noderev,
+ svn_fs_x__noderev_t *noderev,
apr_hash_t *proplist,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1649060&r1=1649059&r2=1649060&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Fri Jan 2 15:04:41 2015
@@ -79,7 +79,7 @@
them concurrently on disk! (Why is the DAG node cache safer than
the root DAG node? When cloning transaction DAG nodes in and out
of the cache, all of the possibly-mutable data from the
- node_revision_t inside the dag_node_t is dropped.) Additionally,
+ svn_fs_x__noderev_t inside the dag_node_t is dropped.) Additionally,
revisions are immutable enough that their DAG node cache can be
kept in the FS object and shared among multiple revision root
objects.
@@ -1855,7 +1855,7 @@ merge(svn_stringbuf_t *conflict_p,
happening), the merge should fail. See issue #2751.
*/
{
- node_revision_t *tgt_nr, *anc_nr, *src_nr;
+ svn_fs_x__noderev_t *tgt_nr, *anc_nr, *src_nr;
svn_boolean_t same;
apr_pool_t *scratch_pool;