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 2013/10/30 13:53:50 UTC
svn commit: r1537069 - in
/subversion/branches/log-addressing/subversion/libsvn_fs_fs: cached_data.c
pack.c
Author: philip
Date: Wed Oct 30 12:53:50 2013
New Revision: 1537069
URL: http://svn.apache.org/r1537069
Log:
On the log-addressing branch:
* subversion/libsvn_fs_fs/cached_data.c
(block_read_windows): Reduce scope of variable, remove unnecessary
initialisation.
(block_read_changes, block_read_noderev): "TYPE *" instead of "TYPE*",
remove unnecessary initialisation.
* subversion/libsvn_fs_fs/pack.c
(initialize_pack_context, auto_pad_block, store_items, write_l2p_index,
append_revision): Remove space-before-paren.
Modified:
subversion/branches/log-addressing/subversion/libsvn_fs_fs/cached_data.c
subversion/branches/log-addressing/subversion/libsvn_fs_fs/pack.c
Modified: subversion/branches/log-addressing/subversion/libsvn_fs_fs/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/branches/log-addressing/subversion/libsvn_fs_fs/cached_data.c?rev=1537069&r1=1537068&r2=1537069&view=diff
==============================================================================
--- subversion/branches/log-addressing/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/branches/log-addressing/subversion/libsvn_fs_fs/cached_data.c Wed Oct 30 12:53:50 2013
@@ -2324,7 +2324,6 @@ block_read_windows(svn_fs_fs__rep_header
fs_fs_data_t *ffd = fs->fsap_data;
rep_state_t rs = { 0 };
apr_off_t offset;
- svn_boolean_t is_cached = FALSE;
window_cache_key_t key = { 0 };
if ( (rep_header->type != svn_fs_fs__rep_plain
@@ -2341,6 +2340,7 @@ block_read_windows(svn_fs_fs__rep_header
if (rep_header->type == svn_fs_fs__rep_plain)
{
svn_stringbuf_t *plaintext;
+ svn_boolean_t is_cached;
/* already in cache? */
SVN_ERR(svn_cache__has_key(&is_cached, rs.combined_cache,
@@ -2472,7 +2472,7 @@ static svn_error_t *
block_read_changes(apr_array_header_t **changes,
svn_fs_t *fs,
svn_fs_fs__revision_file_t *rev_file,
- svn_fs_fs__p2l_entry_t* entry,
+ svn_fs_fs__p2l_entry_t *entry,
svn_boolean_t must_read,
apr_pool_t *pool)
{
@@ -2484,7 +2484,7 @@ block_read_changes(apr_array_header_t **
/* already in cache? */
if (!must_read && ffd->changes_cache)
{
- svn_boolean_t is_cached = FALSE;
+ svn_boolean_t is_cached;
SVN_ERR(svn_cache__has_key(&is_cached, ffd->changes_cache,
&entry->item.revision, pool));
if (is_cached)
@@ -2515,7 +2515,7 @@ static svn_error_t *
block_read_noderev(node_revision_t **noderev_p,
svn_fs_t *fs,
svn_fs_fs__revision_file_t *rev_file,
- svn_fs_fs__p2l_entry_t* entry,
+ svn_fs_fs__p2l_entry_t *entry,
svn_boolean_t must_read,
apr_pool_t *pool)
{
@@ -2532,7 +2532,7 @@ block_read_noderev(node_revision_t **nod
/* already in cache? */
if (!must_read && ffd->node_revision_cache)
{
- svn_boolean_t is_cached = FALSE;
+ svn_boolean_t is_cached;
SVN_ERR(svn_cache__has_key(&is_cached, ffd->node_revision_cache,
&key, pool));
if (is_cached)
Modified: subversion/branches/log-addressing/subversion/libsvn_fs_fs/pack.c
URL: http://svn.apache.org/viewvc/subversion/branches/log-addressing/subversion/libsvn_fs_fs/pack.c?rev=1537069&r1=1537068&r2=1537069&view=diff
==============================================================================
--- subversion/branches/log-addressing/subversion/libsvn_fs_fs/pack.c (original)
+++ subversion/branches/log-addressing/subversion/libsvn_fs_fs/pack.c Wed Oct 30 12:53:50 2013
@@ -272,14 +272,14 @@ initialize_pack_context(pack_context_t *
| APR_CREATE, APR_OS_DEFAULT, pool));
/* Proto index files */
- SVN_ERR(svn_fs_fs__l2p_proto_index_open
- (&context->proto_l2p_index,
+ SVN_ERR(svn_fs_fs__l2p_proto_index_open(
+ &context->proto_l2p_index,
svn_dirent_join(pack_file_dir,
PATH_INDEX PATH_EXT_L2P_INDEX,
pool),
pool));
- SVN_ERR(svn_fs_fs__p2l_proto_index_open
- (&context->proto_p2l_index,
+ SVN_ERR(svn_fs_fs__p2l_proto_index_open(
+ &context->proto_p2l_index,
svn_dirent_join(pack_file_dir,
PATH_INDEX PATH_EXT_P2L_INDEX,
pool),
@@ -843,8 +843,8 @@ auto_pad_block(pack_context_t *context,
null_entry.fnv1_checksum = 0;
SVN_ERR(write_null_bytes(context->pack_file, padding, pool));
- SVN_ERR(svn_fs_fs__p2l_proto_index_add_entry
- (context->proto_p2l_index, &null_entry, pool));
+ SVN_ERR(svn_fs_fs__p2l_proto_index_add_entry(
+ context->proto_p2l_index, &null_entry, pool));
context->pack_offset += padding;
}
@@ -896,8 +896,8 @@ store_items(pack_context_t *context,
entry->offset = context->pack_offset;
context->pack_offset += entry->size;
- SVN_ERR(svn_fs_fs__p2l_proto_index_add_entry
- (context->proto_p2l_index, entry, iterpool));
+ SVN_ERR(svn_fs_fs__p2l_proto_index_add_entry(
+ context->proto_p2l_index, entry, iterpool));
APR_ARRAY_PUSH(context->reps, svn_fs_fs__p2l_entry_t *) = entry;
}
@@ -1109,8 +1109,8 @@ write_l2p_index(pack_context_t *context,
if (prev_rev != p2l_entry->item.revision)
{
prev_rev = p2l_entry->item.revision;
- SVN_ERR(svn_fs_fs__l2p_proto_index_add_revision
- (context->proto_l2p_index, iterpool));
+ SVN_ERR(svn_fs_fs__l2p_proto_index_add_revision(
+ context->proto_l2p_index, iterpool));
}
/* add entry */
@@ -1324,11 +1324,11 @@ append_revision(pack_context_t *context,
{
entry->offset += context->pack_offset;
offset += entry->size;
- SVN_ERR(svn_fs_fs__l2p_proto_index_add_entry
- (context->proto_l2p_index, entry->offset,
+ SVN_ERR(svn_fs_fs__l2p_proto_index_add_entry(
+ context->proto_l2p_index, entry->offset,
entry->item.number, iterpool));
- SVN_ERR(svn_fs_fs__p2l_proto_index_add_entry
- (context->proto_p2l_index, entry, iterpool));
+ SVN_ERR(svn_fs_fs__p2l_proto_index_add_entry(
+ context->proto_p2l_index, entry, iterpool));
}
}
}