Author: stefan2
Date: Fri Jan 2 14:20:29 2015
New Revision: 1649039
URL: http://svn.apache.org/r1649039
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
(pair_cache_key_t): Rename this ...
(svn_fs_x__pair_cache_key_t): ... to this.
* subversion/libsvn_fs_x/cached_data.c
* subversion/libsvn_fs_x/caching.c
* subversion/libsvn_fs_x/index.c
* subversion/libsvn_fs_x/revprops.c
(): s/pair_cache_key_t/svn_fs_x__pair_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
subversion/trunk/subversion/libsvn_fs_x/index.c
subversion/trunk/subversion/libsvn_fs_x/revprops.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=1649039&r1=1649038&r2=1649039&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:20:29
2015
@@ -312,7 +312,7 @@ get_node_revision_body(node_revision_t *
/* noderevs in rev / pack files can be cached */
svn_revnum_t revision = svn_fs_x__get_revnum(id->change_set);
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
SVN_ERR(svn_fs_x__open_pack_or_rev_file(&revision_file, fs, revision,
scratch_pool, scratch_pool));
@@ -419,7 +419,7 @@ svn_fs_x__get_mergeinfo_count(apr_int64_
if ( svn_fs_x__is_packed_rev(fs, revision)
&& ffd->noderevs_container_cache)
{
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
apr_off_t offset;
apr_uint32_t sub_item;
svn_boolean_t is_cached;
@@ -976,7 +976,7 @@ struct rep_read_baton
/* The key for the fulltext cache for this rep, if there is a
fulltext cache. */
- pair_cache_key_t fulltext_cache_key;
+ svn_fs_x__pair_cache_key_t fulltext_cache_key;
/* The text we've been reading, if we're going to cache it. */
svn_stringbuf_t *current_fulltext;
@@ -1311,7 +1311,7 @@ static svn_error_t *
rep_read_get_baton(struct rep_read_baton **rb_p,
svn_fs_t *fs,
representation_t *rep,
- pair_cache_key_t fulltext_cache_key,
+ svn_fs_x__pair_cache_key_t fulltext_cache_key,
apr_pool_t *pool)
{
struct rep_read_baton *b;
@@ -1443,7 +1443,7 @@ read_container_window(svn_stringbuf_t **
svn_fs_x__rep_extractor_t *extractor = NULL;
svn_fs_t *fs = rs->sfile->fs;
fs_x_data_t *ffd = fs->fsap_data;
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
svn_revnum_t revision = svn_fs_x__get_revnum(rs->rep_id.change_set);
SVN_ERR(auto_set_start_offset(rs, scratch_pool));
@@ -2157,7 +2157,7 @@ svn_fs_x__get_contents(svn_stream_t **co
struct rep_read_baton *rb;
svn_revnum_t revision = svn_fs_x__get_revnum(rep->id.change_set);
- pair_cache_key_t fulltext_cache_key = { 0 };
+ svn_fs_x__pair_cache_key_t fulltext_cache_key = { 0 };
fulltext_cache_key.revision = revision;
fulltext_cache_key.second = rep->id.number;
@@ -2235,7 +2235,7 @@ svn_fs_x__try_process_file_contents(svn_
if (rep)
{
fs_x_data_t *ffd = fs->fsap_data;
- pair_cache_key_t fulltext_cache_key = { 0 };
+ svn_fs_x__pair_cache_key_t fulltext_cache_key = { 0 };
fulltext_cache_key.revision = svn_fs_x__get_revnum(rep->id.change_set);
fulltext_cache_key.second = rep->id.number;
@@ -2735,7 +2735,7 @@ svn_fs_x__get_proplist(apr_hash_t **prop
{
fs_x_data_t *ffd = fs->fsap_data;
representation_t *rep = noderev->prop_rep;
- pair_cache_key_t key = { 0 };
+ svn_fs_x__pair_cache_key_t key = { 0 };
key.revision = svn_fs_x__get_revnum(rep->id.change_set);
key.second = rep->id.number;
@@ -2797,7 +2797,7 @@ svn_fs_x__get_changes(apr_array_header_t
{
apr_off_t offset;
apr_uint32_t sub_item;
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
SVN_ERR(svn_fs_x__item_offset(&offset, &sub_item, fs, revision_file,
&id, scratch_pool));
@@ -2845,7 +2845,7 @@ static svn_error_t *
block_read_contents(svn_fs_t *fs,
svn_fs_x__revision_file_t *rev_file,
svn_fs_x__p2l_entry_t* entry,
- pair_cache_key_t *key,
+ svn_fs_x__pair_cache_key_t *key,
apr_off_t max_offset,
apr_pool_t *scratch_pool)
{
@@ -2988,7 +2988,7 @@ block_read_changes_container(apr_array_h
{
fs_x_data_t *ffd = fs->fsap_data;
svn_fs_x__changes_t *container;
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
svn_stream_t *stream;
svn_revnum_t revision = svn_fs_x__get_revnum(entry->items[0].change_set);
@@ -3030,7 +3030,7 @@ block_read_noderev(node_revision_t **nod
svn_fs_t *fs,
svn_fs_x__revision_file_t *rev_file,
svn_fs_x__p2l_entry_t* entry,
- pair_cache_key_t *key,
+ svn_fs_x__pair_cache_key_t *key,
svn_boolean_t must_read,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -3083,7 +3083,7 @@ block_read_noderevs_container(node_revis
fs_x_data_t *ffd = fs->fsap_data;
svn_fs_x__noderevs_t *container;
svn_stream_t *stream;
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
svn_revnum_t revision = svn_fs_x__get_revnum(entry->items[0].change_set);
key.revision = svn_fs_x__packed_base_rev(fs, revision);
@@ -3130,7 +3130,7 @@ block_read_reps_container(svn_fs_x__rep_
fs_x_data_t *ffd = fs->fsap_data;
svn_fs_x__reps_t *container;
svn_stream_t *stream;
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
svn_revnum_t revision = svn_fs_x__get_revnum(entry->items[0].change_set);
key.revision = svn_fs_x__packed_base_rev(fs, revision);
@@ -3231,7 +3231,7 @@ block_read(void **result,
&& entry->size < ffd->block_size))
{
void *item = NULL;
- pair_cache_key_t key = { 0 };
+ svn_fs_x__pair_cache_key_t key = { 0 };
key.revision = svn_fs_x__get_revnum(entry->items[0].change_set);
key.second = entry->items[0].number;
Modified: subversion/trunk/subversion/libsvn_fs_x/caching.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/caching.c?rev=1649039&r1=1649038&r2=1649039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/caching.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/caching.c Fri Jan 2 14:20:29 2015
@@ -460,7 +460,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
32, 32, /* ~200 byte / entry; 1k entries total */
svn_fs_x__serialize_node_revision,
svn_fs_x__deserialize_node_revision,
- sizeof(pair_cache_key_t),
+ sizeof(svn_fs_x__pair_cache_key_t),
apr_pstrcat(pool, prefix, "NODEREVS", SVN_VA_NULL),
SVN_CACHE__MEMBUFFER_HIGH_PRIORITY,
fs,
@@ -504,7 +504,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
0, 0, /* Do not use inprocess cache */
/* Values are svn_stringbuf_t */
NULL, NULL,
- sizeof(pair_cache_key_t),
+ sizeof(svn_fs_x__pair_cache_key_t),
apr_pstrcat(pool, prefix, "TEXT", SVN_VA_NULL),
SVN_CACHE__MEMBUFFER_DEFAULT_PRIORITY,
fs,
@@ -517,7 +517,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
0, 0, /* Do not use inprocess cache */
svn_fs_x__serialize_properties,
svn_fs_x__deserialize_properties,
- sizeof(pair_cache_key_t),
+ sizeof(svn_fs_x__pair_cache_key_t),
apr_pstrcat(pool, prefix, "PROP",
SVN_VA_NULL),
SVN_CACHE__MEMBUFFER_DEFAULT_PRIORITY,
@@ -570,7 +570,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
0, 0, /* Do not use inprocess cache */
svn_fs_x__serialize_properties,
svn_fs_x__deserialize_properties,
- sizeof(pair_cache_key_t),
+ sizeof(svn_fs_x__pair_cache_key_t),
apr_pstrcat(pool, prefix, "REVPROP",
SVN_VA_NULL),
SVN_CACHE__MEMBUFFER_DEFAULT_PRIORITY,
@@ -626,7 +626,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
16, 4, /* Important, largish objects */
svn_fs_x__serialize_noderevs_container,
svn_fs_x__deserialize_noderevs_container,
- sizeof(pair_cache_key_t),
+ sizeof(svn_fs_x__pair_cache_key_t),
apr_pstrcat(pool, prefix, "NODEREVSCNT",
SVN_VA_NULL),
SVN_CACHE__MEMBUFFER_HIGH_PRIORITY,
@@ -639,7 +639,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
0, 0, /* Do not use inprocess cache */
svn_fs_x__serialize_changes_container,
svn_fs_x__deserialize_changes_container,
- sizeof(pair_cache_key_t),
+ sizeof(svn_fs_x__pair_cache_key_t),
apr_pstrcat(pool, prefix, "CHANGESCNT",
SVN_VA_NULL),
0,
@@ -652,7 +652,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
0, 0, /* Do not use inprocess cache */
svn_fs_x__serialize_reps_container,
svn_fs_x__deserialize_reps_container,
- sizeof(pair_cache_key_t),
+ sizeof(svn_fs_x__pair_cache_key_t),
apr_pstrcat(pool, prefix, "REPSCNT",
SVN_VA_NULL),
0,
@@ -667,7 +667,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
a reasonable number of revisions (1k) */
svn_fs_x__serialize_l2p_header,
svn_fs_x__deserialize_l2p_header,
- sizeof(pair_cache_key_t),
+ sizeof(svn_fs_x__pair_cache_key_t),
apr_pstrcat(pool, prefix, "L2P_HEADER",
SVN_VA_NULL),
SVN_CACHE__MEMBUFFER_HIGH_PRIORITY,
@@ -694,7 +694,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
4, 1, /* Large entries. Rarely used. */
svn_fs_x__serialize_p2l_header,
svn_fs_x__deserialize_p2l_header,
- sizeof(pair_cache_key_t),
+ sizeof(svn_fs_x__pair_cache_key_t),
apr_pstrcat(pool, prefix, "P2L_HEADER",
SVN_VA_NULL),
SVN_CACHE__MEMBUFFER_HIGH_PRIORITY,
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1649039&r1=1649038&r2=1649039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Fri Jan 2 14:20:29 2015
@@ -208,14 +208,14 @@ typedef struct svn_fs_x__dag_cache_t svn
Note: Cache keys should be 16 bytes for best performance and there
should be no padding. */
-typedef struct pair_cache_key_t
+typedef struct svn_fs_x__pair_cache_key_t
{
/* The object's revision. Use the 64 data type to prevent padding. */
apr_int64_t revision;
/* Sub-address: item index, revprop generation, packed flag, etc. */
apr_int64_t second;
-} pair_cache_key_t;
+} svn_fs_x__pair_cache_key_t;
/* Key type that identifies a representation / rep header. */
typedef struct representation_cache_key_t
Modified: subversion/trunk/subversion/libsvn_fs_x/index.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/index.c?rev=1649039&r1=1649038&r2=1649039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/index.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/index.c Fri Jan 2 14:20:29 2015
@@ -1280,7 +1280,7 @@ get_l2p_header_body(l2p_header_t **heade
apr_array_header_t *expanded_values
= apr_array_make(scratch_pool, 16, sizeof(apr_uint64_t));
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
key.revision = rev_file->start_revision;
key.second = rev_file->is_packed;
@@ -1403,7 +1403,7 @@ get_l2p_page_info(l2p_page_info_baton_t
void *dummy = NULL;
/* try to find the info in the cache */
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
key.revision = base_revision(fs, baton->revision);
key.second = svn_fs_x__is_packed_rev(fs, baton->revision);
SVN_ERR(svn_cache__get_partial((void**)&dummy, &is_cached,
@@ -1439,7 +1439,7 @@ get_l2p_header(l2p_header_t **header,
svn_boolean_t is_cached = FALSE;
/* first, try cache lookop */
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
key.revision = rev_file->start_revision;
key.second = rev_file->is_packed;
SVN_ERR(svn_cache__get((void**)header, &is_cached, ffd->l2p_header_cache,
@@ -1671,7 +1671,7 @@ get_l2p_page_table(apr_array_header_t *p
svn_boolean_t is_cached = FALSE;
l2p_page_table_baton_t baton;
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
key.revision = base_revision(fs, revision);
key.second = svn_fs_x__is_packed_rev(fs, revision);
@@ -2517,7 +2517,7 @@ get_p2l_header(p2l_header_t **header,
svn_boolean_t is_cached = FALSE;
/* look for the header data in our cache */
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
key.revision = rev_file->start_revision;
key.second = rev_file->is_packed;
@@ -2601,7 +2601,7 @@ get_p2l_page_info(p2l_page_info_baton_t
void *dummy = NULL;
/* look for the header data in our cache */
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
key.revision = base_revision(fs, baton->revision);
key.second = svn_fs_x__is_packed_rev(fs, baton->revision);
@@ -3438,7 +3438,7 @@ svn_fs_x__p2l_get_max_offset(apr_off_t *
apr_off_t *offset_p;
/* look for the header data in our cache */
- pair_cache_key_t key;
+ svn_fs_x__pair_cache_key_t key;
key.revision = base_revision(fs, revision);
key.second = svn_fs_x__is_packed_rev(fs, revision);
Modified: subversion/trunk/subversion/libsvn_fs_x/revprops.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/revprops.c?rev=1649039&r1=1649038&r2=1649039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/revprops.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/revprops.c Fri Jan 2 14:20:29 2015
@@ -679,7 +679,7 @@ parse_revprop(apr_hash_t **properties,
if (has_revprop_cache(fs, pool))
{
fs_x_data_t *ffd = fs->fsap_data;
- pair_cache_key_t key = { 0 };
+ svn_fs_x__pair_cache_key_t key = { 0 };
key.revision = revision;
key.second = generation;
@@ -1091,7 +1091,7 @@ svn_fs_x__get_revision_proplist(apr_hash
if (!bypass_cache && has_revprop_cache(fs, pool))
{
svn_boolean_t is_cached;
- pair_cache_key_t key = { 0 };
+ svn_fs_x__pair_cache_key_t key = { 0 };
SVN_ERR(read_revprop_generation(&generation, fs, pool));
