Author: stefan2
Date: Fri Jan 2 14:26:55 2015
New Revision: 1649041
URL: http://svn.apache.org/r1649041
Log:
In FSX, begin to rename global structs to meet our coding guidelines.
This is the first of a series of search-replace changes.
* subversion/libsvn_fs_x/fs.h
(window_cache_key_t): Rename to ...
(svn_fs_x__window_cache_key_t): ... this.
(fs_x_data_t): Update docstrings.
* subversion/libsvn_fs_x/cached_data.c
* subversion/libsvn_fs_x/caching.c
(): s/swindow_cache_key_t/svn_fs_x__window_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=1649041&r1=1649040&r2=1649041&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:26:55
2015
@@ -999,8 +999,8 @@ struct rep_read_baton
/* Set window key in *KEY to address the window described by RS.
For convenience, return the KEY. */
-static window_cache_key_t *
-get_window_key(window_cache_key_t *key, rep_state_t *rs)
+static svn_fs_x__window_cache_key_t *
+get_window_key(svn_fs_x__window_cache_key_t *key, rep_state_t *rs)
{
svn_revnum_t revision = svn_fs_x__get_revnum(rs->rep_id.change_set);
assert(revision <= APR_UINT32_MAX);
@@ -1079,7 +1079,7 @@ get_cached_window_sizes(window_sizes_t *
}
else
{
- window_cache_key_t key = { 0 };
+ svn_fs_x__window_cache_key_t key = { 0 };
SVN_ERR(svn_cache__get_partial((void **)sizes,
is_cached,
rs->window_cache,
@@ -1109,7 +1109,7 @@ get_cached_window(svn_txdelta_window_t *
{
/* ask the cache for the desired txdelta window */
svn_fs_x__txdelta_cached_window_t *cached_window;
- window_cache_key_t key = { 0 };
+ svn_fs_x__window_cache_key_t key = { 0 };
get_window_key(&key, rs);
key.chunk_index = chunk_index;
SVN_ERR(svn_cache__get((void **) &cached_window,
@@ -1146,7 +1146,7 @@ set_cached_window(svn_txdelta_window_t *
{
/* store the window and the first offset _past_ it */
svn_fs_x__txdelta_cached_window_t cached_window;
- window_cache_key_t key = {0};
+ svn_fs_x__window_cache_key_t key = {0};
cached_window.window = window;
cached_window.start_offset = start_offset - rs->start;
@@ -1183,7 +1183,7 @@ get_cached_combined_window(svn_stringbuf
else
{
/* ask the cache for the desired txdelta window */
- window_cache_key_t key = { 0 };
+ svn_fs_x__window_cache_key_t key = { 0 };
return svn_cache__get((void **)window_p,
is_cached,
rs->combined_cache,
@@ -1206,7 +1206,7 @@ set_cached_combined_window(svn_stringbuf
{
/* but key it with the start offset because that is the known state
* when we will look it up */
- window_cache_key_t key = { 0 };
+ svn_fs_x__window_cache_key_t key = { 0 };
return svn_cache__set(rs->combined_cache,
get_window_key(&key, rs),
window,
Modified: subversion/trunk/subversion/libsvn_fs_x/caching.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/caching.c?rev=1649041&r1=1649040&r2=1649041&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/caching.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/caching.c Fri Jan 2 14:26:55 2015
@@ -592,7 +592,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
0, 0, /* Do not use inprocess cache */
svn_fs_x__serialize_txdelta_window,
svn_fs_x__deserialize_txdelta_window,
- sizeof(window_cache_key_t),
+ sizeof(svn_fs_x__window_cache_key_t),
apr_pstrcat(pool, prefix, "TXDELTA_WINDOW",
SVN_VA_NULL),
SVN_CACHE__MEMBUFFER_LOW_PRIORITY,
@@ -606,7 +606,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(window_cache_key_t),
+ sizeof(svn_fs_x__window_cache_key_t),
apr_pstrcat(pool, prefix, "COMBINED_WINDOW",
SVN_VA_NULL),
SVN_CACHE__MEMBUFFER_LOW_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=1649041&r1=1649040&r2=1649041&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Fri Jan 2 14:26:55 2015
@@ -233,7 +233,7 @@ typedef struct svn_fs_x__representation_
/* Key type that identifies a txdelta window.
Note: Cache keys should require no padding. */
-typedef struct window_cache_key_t
+typedef struct svn_fs_x__window_cache_key_t
{
/* The object's revision. Use the 64 data type to prevent padding. */
apr_int64_t revision;
@@ -243,7 +243,7 @@ typedef struct window_cache_key_t
/* Item index of the representation */
apr_uint64_t item_index;
-} window_cache_key_t;
+} svn_fs_x__window_cache_key_t;
/* Private (non-shared) FSX-specific data for each svn_fs_t object.
Any caches in here may be NULL. */
@@ -311,11 +311,11 @@ typedef struct fs_x_data_t
respective pack file. */
svn_cache__t *packed_offset_cache;
- /* Cache for txdelta_window_t objects; the key is window_cache_key_t */
+ /* Cache for txdelta_window_t objects; the key is
svn_fs_x__window_cache_key_t */
svn_cache__t *txdelta_window_cache;
/* Cache for combined windows as svn_stringbuf_t objects;
- the key is window_cache_key_t */
+ the key is svn_fs_x__window_cache_key_t */
svn_cache__t *combined_window_cache;
/* Cache for svn_fs_x__rep_header_t objects;
