Author: stefan2
Date: Fri Jan 2 14:15:31 2015
New Revision: 1649036
URL: http://svn.apache.org/r1649036
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
(fs_x_dag_cache_t): Rename this ...
(svn_fs_x__dag_cache_t): ... to this.
(fs_x_data_t): Update reference.
* subversion/libsvn_fs_x/tree.h
* subversion/libsvn_fs_x/tree.c
(): s/fs_x_dag_cache_t/svn_fs_x__dag_cache_t/g
Modified:
subversion/trunk/subversion/libsvn_fs_x/fs.h
subversion/trunk/subversion/libsvn_fs_x/tree.c
subversion/trunk/subversion/libsvn_fs_x/tree.h
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1649036&r1=1649035&r2=1649036&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Fri Jan 2 14:15:31 2015
@@ -202,7 +202,7 @@ typedef struct svn_fs_x__shared_data_t
} svn_fs_x__shared_data_t;
/* Data structure for the 1st level DAG node cache. */
-typedef struct fs_x_dag_cache_t fs_x_dag_cache_t;
+typedef struct svn_fs_x__dag_cache_t svn_fs_x__dag_cache_t;
/* Key type for all caches that use revision + offset / counter as key.
@@ -280,7 +280,7 @@ typedef struct fs_x_data_t
svn_boolean_t fail_stop;
/* Caches native dag_node_t* instances and acts as a 1st level cache */
- fs_x_dag_cache_t *dag_node_cache;
+ svn_fs_x__dag_cache_t *dag_node_cache;
/* DAG node cache for immutable nodes. Maps (revision, fspath)
to (dag_node_t *). This is the 2nd level cache for DAG nodes. */
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1649036&r1=1649035&r2=1649036&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Fri Jan 2 14:15:31 2015
@@ -163,7 +163,7 @@ enum { BUCKET_COUNT = 256 };
exceeds a certain threshold, the pool will be cleared and the cache
with it.
*/
-struct fs_x_dag_cache_t
+struct svn_fs_x__dag_cache_t
{
/* fixed number of (possibly empty) cache entries */
cache_entry_t buckets[BUCKET_COUNT];
@@ -186,10 +186,10 @@ struct fs_x_dag_cache_t
apr_size_t last_non_empty;
};
-fs_x_dag_cache_t*
+svn_fs_x__dag_cache_t*
svn_fs_x__create_dag_cache(apr_pool_t *pool)
{
- fs_x_dag_cache_t *result = apr_pcalloc(pool, sizeof(*result));
+ svn_fs_x__dag_cache_t *result = apr_pcalloc(pool, sizeof(*result));
result->pool = svn_pool_create(pool);
return result;
@@ -198,7 +198,7 @@ svn_fs_x__create_dag_cache(apr_pool_t *p
/* Clears the CACHE at regular intervals (destroying all cached nodes)
*/
static void
-auto_clear_dag_cache(fs_x_dag_cache_t* cache)
+auto_clear_dag_cache(svn_fs_x__dag_cache_t* cache)
{
if (cache->insertions > BUCKET_COUNT)
{
@@ -214,7 +214,7 @@ auto_clear_dag_cache(fs_x_dag_cache_t* c
may then set it to the corresponding DAG node allocated in CACHE->POOL.
*/
static cache_entry_t *
-cache_lookup( fs_x_dag_cache_t *cache
+cache_lookup( svn_fs_x__dag_cache_t *cache
, svn_revnum_t revision
, const char *path)
{
@@ -302,7 +302,7 @@ cache_lookup( fs_x_dag_cache_t *cache
Return NULL otherwise. Since the caller usually already knows the path
length, provide it in PATH_LEN. */
static dag_node_t *
-cache_lookup_last_path(fs_x_dag_cache_t *cache,
+cache_lookup_last_path(svn_fs_x__dag_cache_t *cache,
const char *path,
apr_size_t path_len)
{
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.h?rev=1649036&r1=1649035&r2=1649036&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.h Fri Jan 2 14:15:31 2015
@@ -33,7 +33,7 @@ extern "C" {
/* In POOL, create an instance of a DAG node 1st level cache.
The POOL will be cleared at regular intervals. */
-fs_x_dag_cache_t*
+svn_fs_x__dag_cache_t*
svn_fs_x__create_dag_cache(apr_pool_t *pool);
/* Set *ROOT_P to the root directory of revision REV in filesystem FS.
