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:32:49 UTC
svn commit: r1649045 - in /subversion/trunk/subversion/libsvn_fs_x:
cached_data.c caching.c fs.c fs.h fs_x.c hotcopy.c index.c pack.c
recovery.c rep-cache.c rev_file.c revprops.c transaction.c tree.c util.c
verify.c
Author: stefan2
Date: Fri Jan 2 14:32:48 2015
New Revision: 1649045
URL: http://svn.apache.org/r1649045
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
(fs_x_data_t): Rename to ...
(svn_fs_x__data_t): ... this.
* subversion/libsvn_fs_x/cached_data.c
* subversion/libsvn_fs_x/caching.c
* subversion/libsvn_fs_x/fs.c
* subversion/libsvn_fs_x/fs_x.c
* subversion/libsvn_fs_x/hotcopy.c
* subversion/libsvn_fs_x/index.c
* subversion/libsvn_fs_x/pack.c
* subversion/libsvn_fs_x/recovery.c
* subversion/libsvn_fs_x/rep-cache.c
* subversion/libsvn_fs_x/rev_file.c
* subversion/libsvn_fs_x/revprops.c
* subversion/libsvn_fs_x/transaction.c
* subversion/libsvn_fs_x/tree.c
* subversion/libsvn_fs_x/util.c
* subversion/libsvn_fs_x/verify.c
(): s/fs_x_data_t/svn_fs_x__data_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.c
subversion/trunk/subversion/libsvn_fs_x/fs.h
subversion/trunk/subversion/libsvn_fs_x/fs_x.c
subversion/trunk/subversion/libsvn_fs_x/hotcopy.c
subversion/trunk/subversion/libsvn_fs_x/index.c
subversion/trunk/subversion/libsvn_fs_x/pack.c
subversion/trunk/subversion/libsvn_fs_x/recovery.c
subversion/trunk/subversion/libsvn_fs_x/rep-cache.c
subversion/trunk/subversion/libsvn_fs_x/rev_file.c
subversion/trunk/subversion/libsvn_fs_x/revprops.c
subversion/trunk/subversion/libsvn_fs_x/transaction.c
subversion/trunk/subversion/libsvn_fs_x/tree.c
subversion/trunk/subversion/libsvn_fs_x/util.c
subversion/trunk/subversion/libsvn_fs_x/verify.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=1649045&r1=1649044&r2=1649045&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:32:48 2015
@@ -75,7 +75,7 @@ dgb__log_access(svn_fs_t *fs,
{
/* no-op if this macro is not defined */
#ifdef SVN_FS_X__LOG_ACCESS
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_off_t offset = -1;
apr_off_t end_offset = 0;
apr_uint32_t sub_item = 0;
@@ -182,7 +182,7 @@ aligned_seek(svn_fs_t *fs,
apr_off_t offset,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
return svn_error_trace(svn_io_file_aligned_seek(file, ffd->block_size,
buffer_start, offset,
pool));
@@ -276,7 +276,7 @@ get_node_revision_body(node_revision_t *
{
svn_error_t *err;
svn_boolean_t is_cached = FALSE;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
if (svn_fs_x__is_txn(id->change_set))
{
@@ -409,7 +409,7 @@ svn_fs_x__get_mergeinfo_count(apr_int64_
if (! svn_fs_x__is_txn(id->change_set))
{
/* noderevs in rev / pack files can be cached */
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_revnum_t revision = svn_fs_x__get_revnum(id->change_set);
svn_fs_x__revision_file_t *rev_file;
@@ -525,7 +525,7 @@ rs_aligned_seek(rep_state_t *rs,
apr_off_t offset,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = rs->sfile->fs->fsap_data;
+ svn_fs_x__data_t *ffd = rs->sfile->fs->fsap_data;
return svn_error_trace(svn_io_file_aligned_seek(rs->sfile->rfile->file,
ffd->block_size,
buffer_start, offset,
@@ -597,7 +597,7 @@ create_rep_state_body(rep_state_t **rep_
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
rep_state_t *rs = apr_pcalloc(result_pool, sizeof(*rs));
svn_fs_x__rep_header_t *rh;
svn_boolean_t is_cached = FALSE;
@@ -856,7 +856,7 @@ svn_fs_x__rep_chain_length(int *chain_le
svn_fs_t *fs,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_revnum_t shard_size = ffd->max_files_per_dir;
svn_boolean_t is_delta = FALSE;
int count = 0;
@@ -1442,7 +1442,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;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__pair_cache_key_t key;
svn_revnum_t revision = svn_fs_x__get_revnum(rs->rep_id.change_set);
@@ -1577,7 +1577,7 @@ get_combined_window(svn_stringbuf_t **re
* based on its size SIZE. The decision depends on the cache used by RB.
*/
static svn_boolean_t
-fulltext_size_is_cachable(fs_x_data_t *ffd, svn_filesize_t size)
+fulltext_size_is_cachable(svn_fs_x__data_t *ffd, svn_filesize_t size)
{
return (size < APR_SIZE_MAX)
&& svn_cache__is_cachable(ffd->fulltext_cache, (apr_size_t)size);
@@ -1608,7 +1608,7 @@ init_rep_state(rep_state_t *rs,
svn_fs_x__p2l_entry_t* entry,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
shared_file_t *shared_file = apr_pcalloc(pool, sizeof(*shared_file));
/* this function does not apply to representation containers */
@@ -1724,7 +1724,7 @@ read_rep_header(svn_fs_x__rep_header_t *
svn_fs_x__representation_cache_key_t *key,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_boolean_t is_cached = FALSE;
if (ffd->rep_header_cache)
@@ -2130,7 +2130,7 @@ rep_read_contents(void *baton,
if (rb->off == rb->len && rb->current_fulltext)
{
- fs_x_data_t *ffd = rb->fs->fsap_data;
+ svn_fs_x__data_t *ffd = rb->fs->fsap_data;
SVN_ERR(svn_cache__set(ffd->fulltext_cache, &rb->fulltext_cache_key,
rb->current_fulltext, rb->pool));
rb->current_fulltext = NULL;
@@ -2152,7 +2152,7 @@ svn_fs_x__get_contents(svn_stream_t **co
}
else
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_filesize_t len = rep->expanded_size;
struct rep_read_baton *rb;
svn_revnum_t revision = svn_fs_x__get_revnum(rep->id.change_set);
@@ -2234,7 +2234,7 @@ svn_fs_x__try_process_file_contents(svn_
representation_t *rep = noderev->data_rep;
if (rep)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__pair_cache_key_t fulltext_cache_key = { 0 };
fulltext_cache_key.revision = svn_fs_x__get_revnum(rep->id.change_set);
@@ -2324,7 +2324,7 @@ svn_fs_x__get_file_delta_stream(svn_txde
svn_stream_t *source_stream, *target_stream;
rep_state_t *rep_state;
svn_fs_x__rep_header_t *rep_header;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
/* Try a shortcut: if the target is stored as a delta against the source,
then just use that delta. However, prefer using the fulltext cache
@@ -2591,7 +2591,7 @@ locate_dir_cache(svn_fs_t *fs,
node_revision_t *noderev,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
if (svn_fs_x__is_txn(noderev->noderev_id.change_set))
{
/* data in txns must be addressed by ID since the representation has
@@ -2733,7 +2733,7 @@ svn_fs_x__get_proplist(apr_hash_t **prop
}
else if (noderev->prop_rep)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
representation_t *rep = noderev->prop_rep;
svn_fs_x__pair_cache_key_t key = { 0 };
@@ -2778,7 +2778,7 @@ svn_fs_x__get_changes(apr_array_header_t
{
svn_fs_x__revision_file_t *revision_file;
svn_boolean_t found;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_pool_t *scratch_pool = svn_pool_create(result_pool);
svn_fs_x__id_t id;
@@ -2849,7 +2849,7 @@ block_read_contents(svn_fs_t *fs,
apr_off_t max_offset,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__representation_cache_key_t header_key = { 0 };
rep_state_t rs = { 0 };
svn_filesize_t fulltext_len;
@@ -2932,7 +2932,7 @@ block_read_changes(apr_array_header_t **
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_stream_t *stream;
svn_revnum_t revision = svn_fs_x__get_revnum(entry->items[0].change_set);
if (!must_read && !ffd->changes_cache)
@@ -2986,7 +2986,7 @@ block_read_changes_container(apr_array_h
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__changes_t *container;
svn_fs_x__pair_cache_key_t key;
svn_stream_t *stream;
@@ -3035,7 +3035,7 @@ block_read_noderev(node_revision_t **nod
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_stream_t *stream;
if (!must_read && !ffd->node_revision_cache)
return SVN_NO_ERROR;
@@ -3080,7 +3080,7 @@ block_read_noderevs_container(node_revis
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__noderevs_t *container;
svn_stream_t *stream;
svn_fs_x__pair_cache_key_t key;
@@ -3127,7 +3127,7 @@ block_read_reps_container(svn_fs_x__rep_
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__reps_t *container;
svn_stream_t *stream;
svn_fs_x__pair_cache_key_t key;
@@ -3173,7 +3173,7 @@ block_read(void **result,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_off_t offset, wanted_offset = 0;
apr_off_t block_start = 0;
apr_uint32_t wanted_sub_item = 0;
Modified: subversion/trunk/subversion/libsvn_fs_x/caching.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/caching.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/caching.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/caching.c Fri Jan 2 14:32:48 2015
@@ -359,7 +359,7 @@ svn_error_t *
svn_fs_x__initialize_caches(svn_fs_t *fs,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
const char *prefix = apr_pstrcat(pool,
"fsx:", fs->uuid,
"/", normalize_key_part(fs->path, pool),
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.c Fri Jan 2 14:32:48 2015
@@ -63,7 +63,7 @@
static svn_error_t *
x_serialized_init(svn_fs_t *fs, apr_pool_t *common_pool, apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
const char *key;
void *val;
svn_fs_x__shared_data_t *ffsd;
@@ -203,7 +203,7 @@ x_info(const void **fsx_info,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_fsx_info_t *info = apr_palloc(result_pool, sizeof(*info));
info->fs_type = SVN_FS_TYPE_FSX;
info->shard_size = ffd->max_files_per_dir;
@@ -272,7 +272,7 @@ static fs_vtable_t fs_vtable = {
static svn_error_t *
initialize_fs_struct(svn_fs_t *fs)
{
- fs_x_data_t *ffd = apr_pcalloc(fs->pool, sizeof(*ffd));
+ svn_fs_x__data_t *ffd = apr_pcalloc(fs->pool, sizeof(*ffd));
fs->vtable = &fs_vtable;
fs->fsap_data = ffd;
return SVN_NO_ERROR;
@@ -558,7 +558,7 @@ x_set_svn_fs_open(svn_fs_t *fs,
apr_pool_t *,
apr_pool_t *))
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
ffd->svn_fs_open_ = svn_fs_open_;
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Fri Jan 2 14:32:48 2015
@@ -247,7 +247,7 @@ typedef struct svn_fs_x__window_cache_ke
/* Private (non-shared) FSX-specific data for each svn_fs_t object.
Any caches in here may be NULL. */
-typedef struct fs_x_data_t
+typedef struct svn_fs_x__data_t
{
/* The format number of this FS. */
int format;
@@ -417,7 +417,7 @@ typedef struct fs_x_data_t
/* Pointer to svn_fs_open. */
svn_error_t *(*svn_fs_open_)(svn_fs_t **, const char *, apr_hash_t *,
apr_pool_t *, apr_pool_t *);
-} fs_x_data_t;
+} svn_fs_x__data_t;
/*** Filesystem Transaction ***/
Modified: subversion/trunk/subversion/libsvn_fs_x/fs_x.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs_x.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs_x.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs_x.c Fri Jan 2 14:32:48 2015
@@ -157,7 +157,7 @@ svn_fs_x__write_format(svn_fs_t *fs,
{
svn_stringbuf_t *sb;
const char *path = svn_fs_x__path_format(fs, pool);
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
SVN_ERR_ASSERT(1 <= ffd->format && ffd->format <= SVN_FS_X__FORMAT_NUMBER);
@@ -231,7 +231,7 @@ verify_block_size(apr_int64_t block_size
* and set the respective values in FFD. Use pools as usual.
*/
static svn_error_t *
-read_config(fs_x_data_t *ffd,
+read_config(svn_fs_x__data_t *ffd,
const char *fs_path,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -513,7 +513,7 @@ static svn_error_t *
read_uuid(svn_fs_t *fs,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_file_t *uuid_file;
char buf[APR_UUID_FORMATTED_LENGTH + 2];
apr_size_t limit;
@@ -542,7 +542,7 @@ svn_error_t *
svn_fs_x__read_format_file(svn_fs_t *fs,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
int format, max_files_per_dir;
/* Read info from format file. */
@@ -559,7 +559,7 @@ svn_fs_x__read_format_file(svn_fs_t *fs,
svn_error_t *
svn_fs_x__open(svn_fs_t *fs, const char *path, apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
fs->path = apr_pstrdup(fs->pool, path);
/* Read the FS format file. */
@@ -633,7 +633,7 @@ svn_fs_x__youngest_rev(svn_revnum_t *you
svn_fs_t *fs,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
SVN_ERR(svn_fs_x__read_current(youngest_p, fs, pool));
ffd->youngest_rev_cache = *youngest_p;
@@ -645,7 +645,7 @@ svn_fs_x__ensure_revision_exists(svn_rev
svn_fs_t *fs,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
if (! SVN_IS_VALID_REVNUM(rev))
return svn_error_createf(SVN_ERR_FS_NO_SUCH_REVISION, NULL,
@@ -930,7 +930,7 @@ svn_fs_x__create_file_tree(svn_fs_t *fs,
int shard_size,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
fs->path = apr_pstrdup(fs->pool, path);
ffd->format = format;
@@ -994,7 +994,7 @@ svn_fs_x__create(svn_fs_t *fs,
apr_pool_t *pool)
{
int format = SVN_FS_X__FORMAT_NUMBER;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
fs->path = apr_pstrdup(fs->pool, path);
/* See if compatibility with older versions was explicitly requested. */
@@ -1040,7 +1040,7 @@ svn_fs_x__set_uuid(svn_fs_t *fs,
const char *instance_id,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
const char *uuid_path = svn_fs_x__path_uuid(fs, pool);
svn_stringbuf_t *contents = svn_stringbuf_create_empty(pool);
@@ -1180,7 +1180,7 @@ svn_fs_x__info_format(int *fs_format,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
*fs_format = ffd->format;
*supports_version = apr_palloc(result_pool, sizeof(svn_version_t));
Modified: subversion/trunk/subversion/libsvn_fs_x/hotcopy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/hotcopy.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/hotcopy.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/hotcopy.c Fri Jan 2 14:32:48 2015
@@ -297,7 +297,7 @@ hotcopy_copy_packed_shard(svn_boolean_t
const char *src_subdir_packed_shard;
svn_revnum_t revprop_rev;
apr_pool_t *iterpool;
- fs_x_data_t *src_ffd = src_fs->fsap_data;
+ svn_fs_x__data_t *src_ffd = src_fs->fsap_data;
/* Copy the packed shard. */
src_subdir = svn_dirent_join(src_fs->path, PATH_REVS_DIR, scratch_pool);
@@ -477,8 +477,8 @@ hotcopy_incremental_check_preconditions(
svn_fs_t *dst_fs,
apr_pool_t *pool)
{
- fs_x_data_t *src_ffd = src_fs->fsap_data;
- fs_x_data_t *dst_ffd = dst_fs->fsap_data;
+ svn_fs_x__data_t *src_ffd = src_fs->fsap_data;
+ svn_fs_x__data_t *dst_ffd = dst_fs->fsap_data;
/* We only support incremental hotcopy between the same format. */
if (src_ffd->format != dst_ffd->format)
@@ -552,7 +552,7 @@ hotcopy_revisions(svn_fs_t *src_fs,
void* cancel_baton,
apr_pool_t *pool)
{
- fs_x_data_t *src_ffd = src_fs->fsap_data;
+ svn_fs_x__data_t *src_ffd = src_fs->fsap_data;
int max_files_per_dir = src_ffd->max_files_per_dir;
svn_revnum_t src_min_unpacked_rev;
svn_revnum_t dst_min_unpacked_rev;
@@ -887,7 +887,7 @@ hotcopy_create_empty_dest(svn_fs_t *src_
const char *dst_path,
apr_pool_t *pool)
{
- fs_x_data_t *src_ffd = src_fs->fsap_data;
+ svn_fs_x__data_t *src_ffd = src_fs->fsap_data;
/* Create the DST_FS repository with the same layout as SRC_FS. */
SVN_ERR(svn_fs_x__create_file_tree(dst_fs, dst_path, src_ffd->format,
Modified: subversion/trunk/subversion/libsvn_fs_x/index.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/index.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/index.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/index.c Fri Jan 2 14:32:48 2015
@@ -905,7 +905,7 @@ svn_fs_x__l2p_index_append(svn_checksum_
apr_pool_t * result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_file_t *proto_index = NULL;
svn_stream_t *stream;
int i;
@@ -1076,7 +1076,7 @@ svn_fs_x__l2p_index_append(svn_checksum_
static svn_revnum_t
base_revision(svn_fs_t *fs, svn_revnum_t revision)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
return svn_fs_x__is_packed_rev(fs, revision)
? revision - (revision % ffd->max_files_per_dir)
: revision;
@@ -1241,7 +1241,7 @@ auto_open_l2p_index(svn_fs_x__revision_f
{
if (rev_file->l2p_stream == NULL)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
SVN_ERR(svn_fs_x__auto_read_footer(rev_file));
SVN_ERR(packed_stream_open(&rev_file->l2p_stream,
@@ -1269,7 +1269,7 @@ get_l2p_header_body(l2p_header_t **heade
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_uint64_t value;
apr_size_t i;
apr_size_t page, page_count;
@@ -1397,7 +1397,7 @@ get_l2p_page_info(l2p_page_info_baton_t
svn_fs_t *fs,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
l2p_header_t *result;
svn_boolean_t is_cached = FALSE;
void *dummy = NULL;
@@ -1435,7 +1435,7 @@ get_l2p_header(l2p_header_t **header,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_boolean_t is_cached = FALSE;
/* first, try cache lookop */
@@ -1667,7 +1667,7 @@ get_l2p_page_table(apr_array_header_t *p
svn_revnum_t revision,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_boolean_t is_cached = FALSE;
l2p_page_table_baton_t baton;
@@ -1707,7 +1707,7 @@ prefetch_l2p_pages(svn_boolean_t *end,
apr_off_t max_offset,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
int i;
apr_pool_t *iterpool;
svn_fs_x__page_cache_key_t key = { 0 };
@@ -1794,7 +1794,7 @@ l2p_index_lookup(apr_off_t *offset,
apr_uint64_t item_index,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
l2p_page_info_baton_t info_baton;
l2p_page_baton_t page_baton;
l2p_page_t *page = NULL;
@@ -2204,7 +2204,7 @@ svn_fs_x__p2l_index_append(svn_checksum_
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_uint64_t page_size = ffd->p2l_page_size;
apr_file_t *proto_index = NULL;
svn_stream_t *stream;
@@ -2392,7 +2392,7 @@ auto_open_p2l_index(svn_fs_x__revision_f
{
if (rev_file->p2l_stream == NULL)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
SVN_ERR(svn_fs_x__auto_read_footer(rev_file));
SVN_ERR(packed_stream_open(&rev_file->p2l_stream,
@@ -2509,7 +2509,7 @@ get_p2l_header(p2l_header_t **header,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_uint64_t value;
apr_size_t i;
apr_off_t offset;
@@ -2595,7 +2595,7 @@ get_p2l_page_info(p2l_page_info_baton_t
svn_fs_t *fs,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
p2l_header_t *header;
svn_boolean_t is_cached = FALSE;
void *dummy = NULL;
@@ -2803,7 +2803,7 @@ prefetch_p2l_page(svn_boolean_t *end,
apr_off_t min_offset,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_boolean_t already_cached;
apr_array_header_t *page;
svn_fs_x__page_cache_key_t key = { 0 };
@@ -3014,7 +3014,7 @@ p2l_index_lookup(apr_array_header_t *ent
apr_off_t block_end,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__page_cache_key_t key;
svn_boolean_t is_cached = FALSE;
p2l_page_info_baton_t page_info;
@@ -3280,7 +3280,7 @@ p2l_entry_lookup(svn_fs_x__p2l_entry_t *
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__page_cache_key_t key = { 0 };
svn_boolean_t is_cached = FALSE;
p2l_page_info_baton_t page_info;
@@ -3375,7 +3375,7 @@ svn_fs_x__p2l_item_lookup(svn_fs_x__id_t
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__page_cache_key_t key = { 0 };
svn_boolean_t is_cached = FALSE;
p2l_page_info_baton_t page_info;
@@ -3432,7 +3432,7 @@ svn_fs_x__p2l_get_max_offset(apr_off_t *
svn_revnum_t revision,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
p2l_header_t *header;
svn_boolean_t is_cached = FALSE;
apr_off_t *offset_p;
Modified: subversion/trunk/subversion/libsvn_fs_x/pack.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/pack.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/pack.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/pack.c Fri Jan 2 14:32:48 2015
@@ -251,7 +251,7 @@ initialize_pack_context(pack_context_t *
void *cancel_baton,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
const char *temp_dir;
int max_revs = MIN(ffd->max_files_per_dir, max_items);
@@ -414,7 +414,7 @@ copy_file_data(pack_context_t *context,
/* use streaming copies for larger data blocks. That may require
* the allocation of larger buffers and we should make sure that
* this extra memory is released asap. */
- fs_x_data_t *ffd = context->fs->fsap_data;
+ svn_fs_x__data_t *ffd = context->fs->fsap_data;
apr_pool_t *copypool = svn_pool_create(pool);
char *buffer = apr_palloc(copypool, ffd->block_size);
@@ -816,7 +816,7 @@ sort_reps(pack_context_t *context)
static apr_ssize_t
get_block_left(pack_context_t *context)
{
- fs_x_data_t *ffd = context->fs->fsap_data;
+ svn_fs_x__data_t *ffd = context->fs->fsap_data;
return ffd->block_size - (context->pack_offset % ffd->block_size);
}
@@ -829,7 +829,7 @@ static svn_error_t *
auto_pad_block(pack_context_t *context,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = context->fs->fsap_data;
+ svn_fs_x__data_t *ffd = context->fs->fsap_data;
/* This is the maximum number of bytes "wasted" that way per block.
* Larger items will cross the block boundaries. */
@@ -1378,7 +1378,7 @@ copy_reps_from_temp(pack_context_t *cont
apr_file_t *temp_file,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = context->fs->fsap_data;
+ svn_fs_x__data_t *ffd = context->fs->fsap_data;
apr_pool_t *iterpool = svn_pool_create(pool);
apr_pool_t *container_pool = svn_pool_create(pool);
@@ -1694,7 +1694,7 @@ static svn_error_t *
pack_range(pack_context_t *context,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = context->fs->fsap_data;
+ svn_fs_x__data_t *ffd = context->fs->fsap_data;
apr_pool_t *revpool = svn_pool_create(pool);
apr_pool_t *iterpool = svn_pool_create(pool);
@@ -1820,7 +1820,7 @@ static svn_error_t *
append_revision(pack_context_t *context,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = context->fs->fsap_data;
+ svn_fs_x__data_t *ffd = context->fs->fsap_data;
apr_off_t offset = 0;
apr_pool_t *iterpool = svn_pool_create(pool);
svn_fs_x__revision_file_t *rev_file;
@@ -1992,7 +1992,7 @@ svn_fs_x__get_packed_offset(apr_off_t *r
svn_revnum_t rev,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_stream_t *manifest_stream;
svn_boolean_t is_cached;
svn_revnum_t shard;
@@ -2118,7 +2118,7 @@ pack_shard(const char *revs_dir,
void *cancel_baton,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
const char *rev_shard_path, *rev_pack_file_dir;
const char *revprops_shard_path, *revprops_pack_file_dir;
@@ -2234,7 +2234,7 @@ pack_body(void *baton,
apr_pool_t *pool)
{
struct pack_baton *pb = baton;
- fs_x_data_t *ffd = pb->fs->fsap_data;
+ svn_fs_x__data_t *ffd = pb->fs->fsap_data;
apr_int64_t completed_shards;
apr_int64_t i;
svn_revnum_t youngest;
Modified: subversion/trunk/subversion/libsvn_fs_x/recovery.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/recovery.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/recovery.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/recovery.c Fri Jan 2 14:32:48 2015
@@ -118,7 +118,7 @@ recover_body(void *baton, apr_pool_t *po
{
struct recover_baton *b = baton;
svn_fs_t *fs = b->fs;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_revnum_t max_rev;
svn_revnum_t youngest_rev;
svn_node_kind_t youngest_revprops_kind;
Modified: subversion/trunk/subversion/libsvn_fs_x/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/rep-cache.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/rep-cache.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/rep-cache.c Fri Jan 2 14:32:48 2015
@@ -61,7 +61,7 @@ open_rep_cache(void *baton,
apr_pool_t *pool)
{
svn_fs_t *fs = baton;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_sqlite__db_t *sdb;
const char *db_path;
int version;
@@ -118,7 +118,7 @@ svn_error_t *
svn_fs_x__open_rep_cache(svn_fs_t *fs,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_error_t *err = svn_atomic__init_once(&ffd->rep_cache_db_opened,
open_rep_cache, fs, pool);
return svn_error_quick_wrap(err, _("Couldn't open rep-cache database"));
@@ -150,7 +150,7 @@ svn_fs_x__walk_rep_reference(svn_fs_t *f
void *cancel_baton,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_sqlite__stmt_t *stmt;
svn_boolean_t have_row;
int iterations = 0;
@@ -239,7 +239,7 @@ svn_fs_x__get_rep_reference(representati
svn_checksum_t *checksum,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_sqlite__stmt_t *stmt;
svn_boolean_t have_row;
@@ -294,7 +294,7 @@ svn_fs_x__set_rep_reference(svn_fs_t *fs
representation_t *rep,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_sqlite__stmt_t *stmt;
svn_error_t *err;
svn_checksum_t checksum;
@@ -351,7 +351,7 @@ svn_fs_x__del_rep_reference(svn_fs_t *fs
svn_revnum_t youngest,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_sqlite__stmt_t *stmt;
if (! ffd->rep_cache_db)
@@ -369,7 +369,7 @@ svn_error_t *
svn_fs_x__lock_rep_cache(svn_fs_t *fs,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
if (! ffd->rep_cache_db)
SVN_ERR(svn_fs_x__open_rep_cache(fs, pool));
Modified: subversion/trunk/subversion/libsvn_fs_x/rev_file.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/rev_file.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/rev_file.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/rev_file.c Fri Jan 2 14:32:48 2015
@@ -37,7 +37,7 @@ static svn_fs_x__revision_file_t *
create_revision_file(svn_fs_t *fs,
apr_pool_t *result_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__revision_file_t *file = apr_palloc(result_pool, sizeof(*file));
file->is_packed = FALSE;
Modified: subversion/trunk/subversion/libsvn_fs_x/revprops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/revprops.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/revprops.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/revprops.c Fri Jan 2 14:32:48 2015
@@ -61,7 +61,7 @@ svn_fs_x__upgrade_pack_revprops(svn_fs_t
void *cancel_baton,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
const char *revprops_shard_path;
const char *revprops_pack_file_dir;
apr_int64_t shard;
@@ -113,7 +113,7 @@ svn_fs_x__upgrade_cleanup_pack_revprops(
void *cancel_baton,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
const char *revprops_shard_path;
apr_int64_t shard;
apr_int64_t first_unpacked_shard
@@ -194,7 +194,7 @@ static svn_error_t *
close_revprop_generation_file(svn_fs_t *fs,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
if (ffd->revprop_generation_file)
{
SVN_ERR(svn_io_file_close(ffd->revprop_generation_file, scratch_pool));
@@ -216,7 +216,7 @@ open_revprop_generation_file(svn_fs_t *f
svn_boolean_t read_only,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_int32_t flags = read_only ? APR_READ : (APR_READ | APR_WRITE);
/* Close the current file handle if it has insufficient rights. */
@@ -299,7 +299,7 @@ read_revprop_generation_file(apr_int64_t
svn_fs_t *fs,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
char buf[CHECKSUMMED_NUMBER_BUFFER_LEN];
apr_size_t len;
@@ -354,7 +354,7 @@ write_revprop_generation_file(svn_fs_t *
apr_int64_t current,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_stringbuf_t *buffer;
apr_off_t offset = 0;
@@ -424,7 +424,7 @@ static svn_boolean_t
has_revprop_cache(svn_fs_t *fs,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_error_t *error;
/* is the cache (still) enabled? */
@@ -472,7 +472,7 @@ revprop_generation_fixup(void *void_bato
apr_pool_t *scratch_pool)
{
revprop_generation_upgrade_t *baton = void_baton;
- fs_x_data_t *ffd = baton->fs->fsap_data;
+ svn_fs_x__data_t *ffd = baton->fs->fsap_data;
assert(ffd->has_write_lock);
/* Make sure we don't operate on stale OS buffers. */
@@ -507,7 +507,7 @@ read_revprop_generation(apr_int64_t *gen
apr_pool_t *scratch_pool)
{
apr_int64_t current = 0;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
/* read the current revprop generation number */
SVN_ERR(read_revprop_generation_file(¤t, fs, scratch_pool));
@@ -562,7 +562,7 @@ begin_revprop_change(apr_int64_t *genera
svn_fs_t *fs,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
SVN_ERR_ASSERT(ffd->has_write_lock);
/* Close and re-open to make sure we read the latest data. */
@@ -589,7 +589,7 @@ end_revprop_change(svn_fs_t *fs,
apr_int64_t generation,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
SVN_ERR_ASSERT(ffd->has_write_lock);
SVN_ERR_ASSERT(generation % 2);
@@ -678,7 +678,7 @@ parse_revprop(apr_hash_t **properties,
SVN_ERR(svn_hash_read2(*properties, stream, SVN_HASH_TERMINATOR, pool));
if (has_revprop_cache(fs, pool))
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__pair_cache_key_t key = { 0 };
key.revision = revision;
@@ -755,7 +755,7 @@ get_revprop_packname(svn_fs_t *fs,
apr_pool_t *pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_stringbuf_t *content = NULL;
const char *manifest_file_path;
int idx, rev_count;
@@ -859,7 +859,7 @@ same_shard(svn_fs_t *fs,
svn_revnum_t r1,
svn_revnum_t r2)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
return (r1 / ffd->max_files_per_dir) == (r2 / ffd->max_files_per_dir);
}
@@ -1078,7 +1078,7 @@ svn_fs_x__get_revision_proplist(apr_hash
svn_boolean_t bypass_cache,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_int64_t generation = 0;
/* not found, yet */
@@ -1281,7 +1281,7 @@ repack_revprops(svn_fs_t *fs,
svn_stream_t *file_stream,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_stream_t *stream;
int i;
@@ -1409,7 +1409,7 @@ write_packed_revprop(const char **final_
apr_hash_t *proplist,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
packed_revprops_t *revprops;
apr_int64_t generation = 0;
svn_stream_t *stream;
@@ -1614,7 +1614,7 @@ svn_fs_x__packed_revprop_available(svn_b
svn_revnum_t revision,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_stringbuf_t *content = NULL;
/* try to read the manifest file */
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Fri Jan 2 14:32:48 2015
@@ -90,7 +90,7 @@ get_shared_txn(svn_fs_t *fs,
svn_fs_x__txn_id_t txn_id,
svn_boolean_t create_new)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__shared_data_t *ffsd = ffd->shared;
svn_fs_x__shared_txn_data_t *txn;
@@ -135,7 +135,7 @@ get_shared_txn(svn_fs_t *fs,
static void
free_shared_txn(svn_fs_t *fs, svn_fs_x__txn_id_t txn_id)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__shared_data_t *ffsd = ffd->shared;
svn_fs_x__shared_txn_data_t *txn, *prev = NULL;
@@ -172,7 +172,7 @@ with_txnlist_lock(svn_fs_t *fs,
const void *baton,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__shared_data_t *ffsd = ffd->shared;
SVN_MUTEX__WITH_LOCK(ffsd->txn_list_lock,
@@ -196,7 +196,7 @@ get_lock_on_filesystem(const char *lock_
static apr_status_t
reset_lock_flag(void *baton_void)
{
- fs_x_data_t *ffd = baton_void;
+ svn_fs_x__data_t *ffd = baton_void;
ffd->has_write_lock = FALSE;
return APR_SUCCESS;
}
@@ -266,7 +266,7 @@ with_some_lock_file(with_lock_baton_t *b
if (!err)
{
svn_fs_t *fs = baton->fs;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
if (baton->is_global_lock)
{
@@ -326,7 +326,7 @@ static void
init_lock_baton(with_lock_baton_t *baton,
lock_id_t lock_id)
{
- fs_x_data_t *ffd = baton->fs->fsap_data;
+ svn_fs_x__data_t *ffd = baton->fs->fsap_data;
svn_fs_x__shared_data_t *ffsd = ffd->shared;
switch (lock_id)
@@ -783,7 +783,7 @@ store_sha1_rep_mapping(svn_fs_t *fs,
node_revision_t *noderev,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
/* if rep sharing has been enabled and the noderev has a data rep and
* its SHA-1 is known, store the rep struct under its SHA1. */
@@ -1670,7 +1670,7 @@ svn_fs_x__set_entry(svn_fs_t *fs,
= svn_fs_x__path_txn_node_children(fs, &parent_noderev->noderev_id, pool);
apr_file_t *file;
svn_stream_t *out;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_pool_t *subpool = svn_pool_create(pool);
if (!rep || !svn_fs_x__is_txn(rep->id.change_set))
@@ -1867,7 +1867,7 @@ shards_spanned(int *spanned,
int walk,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
int shard_size = ffd->max_files_per_dir;
apr_pool_t *iterpool;
@@ -1913,7 +1913,7 @@ choose_delta_base(representation_t **rep
* bits.) */
int walk;
node_revision_t *base;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_pool_t *iterpool;
/* If we have no predecessors, or that one is empty, then use the empty
@@ -2060,7 +2060,7 @@ rep_write_get_baton(struct rep_write_bat
node_revision_t *noderev,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
struct rep_write_baton *b;
apr_file_t *file;
representation_t *base_rep;
@@ -2158,7 +2158,7 @@ get_shared_rep(representation_t **old_re
apr_pool_t *scratch_pool)
{
svn_error_t *err;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
/* Return NULL, if rep sharing has been disabled. */
*old_rep = NULL;
@@ -2546,7 +2546,7 @@ write_container_delta_rep(representation
svn_revnum_t final_revision,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_txdelta_window_handler_t diff_wh;
void *diff_whb;
@@ -2781,7 +2781,7 @@ write_final_rev(svn_fs_x__id_t *new_id_p
apr_off_t my_offset;
svn_fs_x__id_t new_id;
svn_fs_x__id_t noderev_id;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_x__txn_id_t txn_id = svn_fs_x__get_txn_id(id->change_set);
svn_fs_x__p2l_entry_t entry;
svn_fs_x__change_set_t change_set = svn_fs_x__change_set_by_rev(rev);
@@ -3007,10 +3007,10 @@ verify_as_revision_before_current_plus_p
apr_pool_t *pool)
{
#ifdef SVN_DEBUG
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_fs_t *ft; /* fs++ == ft */
svn_fs_root_t *root;
- fs_x_data_t *ft_ffd;
+ svn_fs_x__data_t *ft_ffd;
apr_hash_t *fs_config;
SVN_ERR_ASSERT(ffd->svn_fs_open_);
@@ -3231,7 +3231,7 @@ static svn_error_t *
commit_body(void *baton, apr_pool_t *pool)
{
struct commit_baton *cb = baton;
- fs_x_data_t *ffd = cb->fs->fsap_data;
+ svn_fs_x__data_t *ffd = cb->fs->fsap_data;
const char *old_rev_filename, *rev_filename, *proto_filename;
const char *revprop_filename, *final_revprop;
svn_fs_x__id_t root_id, new_root_id;
@@ -3417,7 +3417,7 @@ svn_fs_x__commit(svn_revnum_t *new_rev_p
apr_pool_t *pool)
{
struct commit_baton cb;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
cb.new_rev_p = new_rev_p;
cb.fs = fs;
@@ -3578,7 +3578,7 @@ svn_fs_x__delete_node_revision(svn_fs_t
&& svn_fs_x__is_txn(noderev->data_rep->id.change_set)
&& noderev->kind == svn_node_dir)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
const svn_fs_x__id_t *key = id;
SVN_ERR(svn_io_remove_file2(svn_fs_x__path_txn_node_children(fs, id,
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Fri Jan 2 14:32:48 2015
@@ -343,7 +343,7 @@ locate_cache(svn_cache__t **cache,
}
else
{
- fs_x_data_t *ffd = root->fs->fsap_data;
+ svn_fs_x__data_t *ffd = root->fs->fsap_data;
if (cache)
*cache = ffd->rev_node_cache;
@@ -373,7 +373,7 @@ dag_node_cache_get(dag_node_t **node_p,
{
/* immutable DAG node. use the global caches for it */
- fs_x_data_t *ffd = root->fs->fsap_data;
+ svn_fs_x__data_t *ffd = root->fs->fsap_data;
cache_entry_t *bucket;
auto_clear_dag_cache(ffd->dag_node_cache);
@@ -825,7 +825,7 @@ try_match_last_node(dag_node_t **node_p,
apr_size_t path_len,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = root->fs->fsap_data;
+ svn_fs_x__data_t *ffd = root->fs->fsap_data;
/* Optimistic lookup: if the last node returned from the cache applied to
the same PATH, return it in NODE. */
@@ -2158,7 +2158,7 @@ svn_fs_x__commit_txn(const char **confli
svn_error_t *err = SVN_NO_ERROR;
svn_stringbuf_t *conflict = svn_stringbuf_create_empty(pool);
svn_fs_t *fs = txn->fs;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
/* Limit memory usage when the repository has a high commit rate and
needs to run the following while loop multiple times. The memory
@@ -4001,7 +4001,7 @@ get_mergeinfo_for_path(svn_mergeinfo_t *
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- fs_x_data_t *ffd = rev_root->fs->fsap_data;
+ svn_fs_x__data_t *ffd = rev_root->fs->fsap_data;
const char *cache_key;
svn_boolean_t found = FALSE;
svn_stringbuf_t *mergeinfo_exists;
Modified: subversion/trunk/subversion/libsvn_fs_x/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/util.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/util.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/util.c Fri Jan 2 14:32:48 2015
@@ -55,7 +55,7 @@ are likely some errors because of that.
svn_boolean_t
svn_fs_x__is_packed_rev(svn_fs_t *fs, svn_revnum_t rev)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
return (rev < ffd->min_unpacked_rev);
}
@@ -64,7 +64,7 @@ svn_fs_x__is_packed_rev(svn_fs_t *fs, sv
svn_boolean_t
svn_fs_x__is_packed_revprop(svn_fs_t *fs, svn_revnum_t rev)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
/* rev 0 will not be packed */
return (rev < ffd->min_unpacked_rev) && (rev != 0);
@@ -73,7 +73,7 @@ svn_fs_x__is_packed_revprop(svn_fs_t *fs
svn_revnum_t
svn_fs_x__packed_base_rev(svn_fs_t *fs, svn_revnum_t rev)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
return rev < ffd->min_unpacked_rev
? rev - (rev % ffd->max_files_per_dir)
@@ -83,7 +83,7 @@ svn_fs_x__packed_base_rev(svn_fs_t *fs,
svn_revnum_t
svn_fs_x__pack_size(svn_fs_t *fs, svn_revnum_t rev)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
return rev < ffd->min_unpacked_rev ? ffd->max_files_per_dir : 1;
}
@@ -141,7 +141,7 @@ const char *
svn_fs_x__path_rev_packed(svn_fs_t *fs, svn_revnum_t rev, const char *kind,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
assert(svn_fs_x__is_packed_rev(fs, rev));
return svn_dirent_join_many(pool, fs->path, PATH_REVS_DIR,
@@ -154,7 +154,7 @@ svn_fs_x__path_rev_packed(svn_fs_t *fs,
const char *
svn_fs_x__path_rev_shard(svn_fs_t *fs, svn_revnum_t rev, apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
return svn_dirent_join_many(pool, fs->path, PATH_REVS_DIR,
apr_psprintf(pool, "%ld",
rev / ffd->max_files_per_dir),
@@ -186,7 +186,7 @@ svn_fs_x__path_revprops_shard(svn_fs_t *
svn_revnum_t rev,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
return svn_dirent_join_many(pool, fs->path, PATH_REVPROPS_DIR,
apr_psprintf(pool, "%ld",
@@ -199,7 +199,7 @@ svn_fs_x__path_revprops_pack_shard(svn_f
svn_revnum_t rev,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
return svn_dirent_join_many(pool, fs->path, PATH_REVPROPS_DIR,
apr_psprintf(pool, "%ld" PATH_EXT_PACKED_SHARD,
@@ -465,7 +465,7 @@ svn_fs_x__read_min_unpacked_rev(svn_revn
svn_error_t *
svn_fs_x__update_min_unpacked_rev(svn_fs_t *fs, apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
return svn_fs_x__read_min_unpacked_rev(&ffd->min_unpacked_rev, fs, pool);
}
Modified: subversion/trunk/subversion/libsvn_fs_x/verify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/verify.c?rev=1649045&r1=1649044&r2=1649045&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/verify.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/verify.c Fri Jan 2 14:32:48 2015
@@ -324,7 +324,7 @@ compare_p2l_to_l2p_index(svn_fs_t *fs,
void *cancel_baton,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_pool_t *iterpool = svn_pool_create(pool);
apr_off_t max_offset;
apr_off_t offset = 0;
@@ -570,7 +570,7 @@ compare_p2l_to_rev(svn_fs_t *fs,
void *cancel_baton,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
apr_pool_t *iterpool = svn_pool_create(pool);
apr_off_t max_offset;
apr_off_t offset = 0;
@@ -732,7 +732,7 @@ verify_metadata_consistency(svn_fs_t *fs
apr_pool_t *pool)
{
svn_error_t *err;
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_revnum_t revision, next_revision;
apr_pool_t *iterpool = svn_pool_create(pool);
@@ -806,7 +806,7 @@ svn_fs_x__verify(svn_fs_t *fs,
void *cancel_baton,
apr_pool_t *pool)
{
- fs_x_data_t *ffd = fs->fsap_data;
+ svn_fs_x__data_t *ffd = fs->fsap_data;
svn_revnum_t youngest = ffd->youngest_rev_cache; /* cache is current */
/* Input validation. */