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 2014/12/16 16:45:41 UTC
svn commit: r1645985 -
/subversion/branches/fsx-id/subversion/libsvn_fs_x/low_level.c
Author: stefan2
Date: Tue Dec 16 15:45:41 2014
New Revision: 1645985
URL: http://svn.apache.org/r1645985
Log:
On the fsx-id branch: Get rid of another NODEREV->ID access.
* subversion/libsvn_fs_x/low_level.c
(read_rep_offsets): The error message shall display the noderev ID instead
of the full ID. Also, the noderev ID cannot be NULL.
(svn_fs_x__read_noderev): Update caller.
Modified:
subversion/branches/fsx-id/subversion/libsvn_fs_x/low_level.c
Modified: subversion/branches/fsx-id/subversion/libsvn_fs_x/low_level.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-id/subversion/libsvn_fs_x/low_level.c?rev=1645985&r1=1645984&r2=1645985&view=diff
==============================================================================
--- subversion/branches/fsx-id/subversion/libsvn_fs_x/low_level.c (original)
+++ subversion/branches/fsx-id/subversion/libsvn_fs_x/low_level.c Tue Dec 16 15:45:41 2014
@@ -327,7 +327,7 @@ svn_fs_x__parse_representation(represent
static svn_error_t *
read_rep_offsets(representation_t **rep_p,
char *string,
- const svn_fs_id_t *noderev_id,
+ const svn_fs_x__noderev_id_t *noderev_id,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -342,11 +342,11 @@ read_rep_offsets(representation_t **rep_
const svn_string_t *id_unparsed;
const char *where;
- id_unparsed = svn_fs_x__id_unparse(noderev_id, scratch_pool);
+ id_unparsed = svn_fs_x__id_part_unparse(noderev_id, scratch_pool);
where = apr_psprintf(scratch_pool,
_("While reading representation offsets "
"for node-revision '%s':"),
- noderev_id ? id_unparsed->data : "(null)");
+ id_unparsed->data);
return svn_error_quick_wrap(err, where);
}
@@ -476,7 +476,8 @@ svn_fs_x__read_noderev(node_revision_t *
if (value)
{
SVN_ERR(read_rep_offsets(&noderev->prop_rep, value,
- noderev->id, result_pool, scratch_pool));
+ &noderev->noderev_id, result_pool,
+ scratch_pool));
}
/* Get the data location. */
@@ -484,7 +485,8 @@ svn_fs_x__read_noderev(node_revision_t *
if (value)
{
SVN_ERR(read_rep_offsets(&noderev->data_rep, value,
- noderev->id, result_pool, scratch_pool));
+ &noderev->noderev_id, result_pool,
+ scratch_pool));
}
/* Get the created path. */