Author: danielsh
Date: Mon Jun 10 10:23:16 2013
New Revision: 1491396
URL: http://svn.apache.org/r1491396
Log:
* subversion/libsvn_fs_fs/fs_fs.c
(set_cached_node_revision_body, parse_revprop, get_revision_proplist,
read_representation, svn_fs_fs__try_process_file_contents,
svn_fs_fs__get_proplist): Remove needless initialization.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1491396&r1=1491395&r2=1491396&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Mon Jun 10 10:23:16 2013
@@ -2239,9 +2239,9 @@ get_cached_node_revision_body(node_revis
else
{
pair_cache_key_t key;
-
key.revision = svn_fs_fs__id_rev(id);
key.second = svn_fs_fs__id_offset(id);
+
SVN_ERR(svn_cache__get((void **) noderev_p,
is_cached,
ffd->node_revision_cache,
@@ -2267,10 +2267,10 @@ set_cached_node_revision_body(node_revis
if (ffd->node_revision_cache && !svn_fs_fs__id_txn_id(id))
{
- pair_cache_key_t key = { 0 };
-
+ pair_cache_key_t key;
key.revision = svn_fs_fs__id_rev(id);
key.second = svn_fs_fs__id_offset(id);
+
return svn_cache__set(ffd->node_revision_cache,
&key,
noderev_p,
@@ -3525,10 +3525,10 @@ parse_revprop(apr_hash_t **properties,
if (has_revprop_cache(fs, pool))
{
fs_fs_data_t *ffd = fs->fsap_data;
- pair_cache_key_t key = { 0 };
-
+ pair_cache_key_t key;
key.revision = revision;
key.second = generation;
+
SVN_ERR(svn_cache__set(ffd->revprop_cache, &key, *properties,
scratch_pool));
}
@@ -3828,7 +3828,7 @@ get_revision_proplist(apr_hash_t **propl
if (has_revprop_cache(fs, pool))
{
svn_boolean_t is_cached;
- pair_cache_key_t key = { 0 };
+ pair_cache_key_t key;
SVN_ERR(read_revprop_generation(&generation, fs, pool));
@@ -5183,12 +5183,12 @@ read_representation(svn_stream_t **conte
else
{
fs_fs_data_t *ffd = fs->fsap_data;
- pair_cache_key_t fulltext_cache_key = { 0 };
+ pair_cache_key_t fulltext_cache_key;
svn_filesize_t len = rep->expanded_size ? rep->expanded_size : rep->size;
struct rep_read_baton *rb;
-
fulltext_cache_key.revision = rep->revision;
fulltext_cache_key.second = rep->offset;
+
if (ffd->fulltext_cache && SVN_IS_VALID_REVNUM(rep->revision)
&& fulltext_size_is_cachable(ffd, len))
{
@@ -5357,10 +5357,10 @@ svn_fs_fs__try_process_file_contents(svn
if (rep)
{
fs_fs_data_t *ffd = fs->fsap_data;
- pair_cache_key_t fulltext_cache_key = { 0 };
-
+ pair_cache_key_t fulltext_cache_key;
fulltext_cache_key.revision = rep->revision;
fulltext_cache_key.second = rep->offset;
+
if (ffd->fulltext_cache && SVN_IS_VALID_REVNUM(rep->revision)
&& fulltext_size_is_cachable(ffd, rep->expanded_size))
{
@@ -5664,10 +5664,10 @@ svn_fs_fs__get_proplist(apr_hash_t **pro
{
fs_fs_data_t *ffd = fs->fsap_data;
representation_t *rep = noderev->prop_rep;
- pair_cache_key_t key = { 0 };
-
+ pair_cache_key_t key;
key.revision = rep->revision;
key.second = rep->offset;
+
if (ffd->properties_cache && SVN_IS_VALID_REVNUM(rep->revision))
{
svn_boolean_t is_cached;