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 15:23:22 UTC
svn commit: r1649040 - in /subversion/trunk/subversion/libsvn_fs_x:
cached_data.c caching.c fs.h
Author: stefan2
Date: Fri Jan 2 14:23:22 2015
New Revision: 1649040
URL: http://svn.apache.org/r1649040
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
(representation_cache_key_t): Rename to ...
(svn_fs_x__representation_cache_key_t): ... this one.
* subversion/libsvn_fs_x/cached_data.c
* subversion/libsvn_fs_x/caching.c
(): s/representation_cache_key_t/svn_fs_x__representation_cache_key_t/g
Modified:
subversion/trunk/subversion/libsvn_fs_x/cached_data.c
subversion/trunk/subversion/libsvn_fs_x/caching.c
subversion/trunk/subversion/libsvn_fs_x/fs.h
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=1649040&r1=1649039&r2=1649040&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/cached_data.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/cached_data.c Fri Jan 2 14:23:22 2015
@@ -620,7 +620,7 @@ create_rep_state_body(rep_state_t **rep_
&& ( ((*shared_file)->revision / ffd->max_files_per_dir)
== (revision / ffd->max_files_per_dir));
- representation_cache_key_t key;
+ svn_fs_x__representation_cache_key_t key;
key.revision = revision;
key.is_packed = revision < ffd->min_unpacked_rev;
key.item_index = rep->id.number;
@@ -1721,7 +1721,7 @@ static svn_error_t *
read_rep_header(svn_fs_x__rep_header_t **rep_header,
svn_fs_t *fs,
svn_stream_t *stream,
- representation_cache_key_t *key,
+ svn_fs_x__representation_cache_key_t *key,
apr_pool_t *pool)
{
fs_x_data_t *ffd = fs->fsap_data;
@@ -1751,7 +1751,7 @@ svn_fs_x__get_representation_length(svn_
svn_fs_x__p2l_entry_t* entry,
apr_pool_t *pool)
{
- representation_cache_key_t key = { 0 };
+ svn_fs_x__representation_cache_key_t key = { 0 };
rep_state_t rs = { 0 };
svn_fs_x__rep_header_t *rep_header;
@@ -2850,7 +2850,7 @@ block_read_contents(svn_fs_t *fs,
apr_pool_t *scratch_pool)
{
fs_x_data_t *ffd = fs->fsap_data;
- representation_cache_key_t header_key = { 0 };
+ svn_fs_x__representation_cache_key_t header_key = { 0 };
rep_state_t rs = { 0 };
svn_filesize_t fulltext_len;
svn_fs_x__rep_header_t *rep_header;
Modified: subversion/trunk/subversion/libsvn_fs_x/caching.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/caching.c?rev=1649040&r1=1649039&r2=1649040&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/caching.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/caching.c Fri Jan 2 14:23:22 2015
@@ -474,7 +474,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
1, 1000, /* ~8 bytes / entry; 1k entries total */
svn_fs_x__serialize_rep_header,
svn_fs_x__deserialize_rep_header,
- sizeof(representation_cache_key_t),
+ sizeof(svn_fs_x__representation_cache_key_t),
apr_pstrcat(pool, prefix, "REPHEADER", SVN_VA_NULL),
SVN_CACHE__MEMBUFFER_DEFAULT_PRIORITY,
fs,
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1649040&r1=1649039&r2=1649040&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Fri Jan 2 14:23:22 2015
@@ -218,7 +218,7 @@ typedef struct svn_fs_x__pair_cache_key_
} svn_fs_x__pair_cache_key_t;
/* Key type that identifies a representation / rep header. */
-typedef struct representation_cache_key_t
+typedef struct svn_fs_x__representation_cache_key_t
{
/* Revision that contains the representation */
svn_revnum_t revision;
@@ -228,7 +228,7 @@ typedef struct representation_cache_key_
/* Item index of the representation */
apr_uint64_t item_index;
-} representation_cache_key_t;
+} svn_fs_x__representation_cache_key_t;
/* Key type that identifies a txdelta window.