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 2013/06/30 19:01:17 UTC
svn commit: r1498157 [7/11] - in
/subversion/branches/fsfs-format7/subversion: libsvn_fs_x/ tests/libsvn_fs_x/
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.c?rev=1498157&r1=1498156&r2=1498157&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.c Sun Jun 30 17:01:16 2013
@@ -141,7 +141,7 @@ typedef apr_uint32_t hash_key_t;
/* Constructor data structure.
*/
-struct svn_fs_fs__reps_builder_t
+struct svn_fs_x__reps_builder_t
{
/* file system to read base representations from */
svn_fs_t *fs;
@@ -168,7 +168,7 @@ struct svn_fs_fs__reps_builder_t
/* R/o container.
*/
-struct svn_fs_fs__reps_t
+struct svn_fs_x__reps_t
{
/* text corpus */
const char *text;
@@ -222,7 +222,7 @@ typedef struct missing_t
/* Fulltext extractor data structure.
*/
-struct svn_fs_fs__rep_extractor_t
+struct svn_fs_x__rep_extractor_t
{
/* filesystem to read the bases from */
svn_fs_t *fs;
@@ -370,11 +370,11 @@ grow_hash(hash_t *hash,
*hash = copy;
}
-svn_fs_fs__reps_builder_t *
-svn_fs_fs__reps_builder_create(svn_fs_t *fs,
- apr_pool_t *pool)
+svn_fs_x__reps_builder_t *
+svn_fs_x__reps_builder_create(svn_fs_t *fs,
+ apr_pool_t *pool)
{
- svn_fs_fs__reps_builder_t *result = apr_pcalloc(pool, sizeof(*result));
+ svn_fs_x__reps_builder_t *result = apr_pcalloc(pool, sizeof(*result));
result->fs = fs;
result->text = svn_stringbuf_create_empty(pool);
@@ -388,24 +388,24 @@ svn_fs_fs__reps_builder_create(svn_fs_t
}
svn_error_t *
-svn_fs_fs__reps_add_base(svn_fs_fs__reps_builder_t *builder,
- representation_t *rep,
- int priority,
- apr_pool_t *scratch_pool)
+svn_fs_x__reps_add_base(svn_fs_x__reps_builder_t *builder,
+ representation_t *rep,
+ int priority,
+ apr_pool_t *scratch_pool)
{
base_t base;
apr_size_t text_start_offset = builder->text->len;
svn_stream_t *stream;
svn_string_t *contents;
- SVN_ERR(svn_fs_fs__get_contents(&stream, builder->fs, rep, scratch_pool));
+ SVN_ERR(svn_fs_x__get_contents(&stream, builder->fs, rep, scratch_pool));
SVN_ERR(svn_string_from_stream(&contents, stream, scratch_pool,
scratch_pool));
base.revision = rep->revision;
base.item_index = rep->item_index;
base.priority = priority;
- base.rep = (apr_uint32_t)svn_fs_fs__reps_add(builder, contents);
+ base.rep = (apr_uint32_t)svn_fs_x__reps_add(builder, contents);
APR_ARRAY_PUSH(builder->bases, base_t) = base;
builder->base_text_len += builder->text->len - text_start_offset;
@@ -417,7 +417,7 @@ svn_fs_fs__reps_add_base(svn_fs_fs__reps
* operation for that text fragment.
*/
static void
-add_new_text(svn_fs_fs__reps_builder_t *builder,
+add_new_text(svn_fs_x__reps_builder_t *builder,
const char *data,
apr_size_t len)
{
@@ -462,8 +462,8 @@ add_new_text(svn_fs_fs__reps_builder_t *
}
apr_size_t
-svn_fs_fs__reps_add(svn_fs_fs__reps_builder_t *builder,
- const svn_string_t *contents)
+svn_fs_x__reps_add(svn_fs_x__reps_builder_t *builder,
+ const svn_string_t *contents)
{
rep_t rep;
const char *current = contents->data;
@@ -539,7 +539,7 @@ svn_fs_fs__reps_add(svn_fs_fs__reps_buil
}
apr_size_t
-svn_fs_fs__reps_estimate_size(const svn_fs_fs__reps_builder_t *builder)
+svn_fs_x__reps_estimate_size(const svn_fs_x__reps_builder_t *builder)
{
/* approx: size of the text exclusive to us @ 50% compression rate
* + 2 bytes per instruction
@@ -564,8 +564,8 @@ svn_fs_fs__reps_estimate_size(const svn_
* instruction sequences. COUNT refers to the top-level instructions only.
*/
static void
-get_text(svn_fs_fs__rep_extractor_t *extractor,
- const svn_fs_fs__reps_t *container,
+get_text(svn_fs_x__rep_extractor_t *extractor,
+ const svn_fs_x__reps_t *container,
apr_size_t instruction_idx,
apr_size_t count)
{
@@ -607,17 +607,17 @@ get_text(svn_fs_fs__rep_extractor_t *ext
}
svn_error_t *
-svn_fs_fs__reps_get(svn_fs_fs__rep_extractor_t **extractor,
- svn_fs_t *fs,
- const svn_fs_fs__reps_t *container,
- apr_size_t idx,
- apr_pool_t *pool)
+svn_fs_x__reps_get(svn_fs_x__rep_extractor_t **extractor,
+ svn_fs_t *fs,
+ const svn_fs_x__reps_t *container,
+ apr_size_t idx,
+ apr_pool_t *pool)
{
apr_uint32_t first = container->first_instructions[idx];
apr_uint32_t last = container->first_instructions[idx + 1];
/* create the extractor object */
- svn_fs_fs__rep_extractor_t *result = apr_pcalloc(pool, sizeof(*result));
+ svn_fs_x__rep_extractor_t *result = apr_pcalloc(pool, sizeof(*result));
result->fs = fs;
result->result = svn_stringbuf_create_empty(pool);
result->pool = pool;
@@ -630,12 +630,12 @@ svn_fs_fs__reps_get(svn_fs_fs__rep_extra
}
svn_error_t *
-svn_fs_fs__extractor_drive(svn_stringbuf_t **contents,
- svn_fs_fs__rep_extractor_t *extractor,
- apr_size_t start_offset,
- apr_size_t size,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_fs_x__extractor_drive(svn_stringbuf_t **contents,
+ svn_fs_x__rep_extractor_t *extractor,
+ apr_size_t start_offset,
+ apr_size_t size,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
/* we don't support base reps right now */
SVN_ERR_ASSERT(extractor->missing == NULL);
@@ -661,9 +661,9 @@ svn_fs_fs__extractor_drive(svn_stringbuf
}
svn_error_t *
-svn_fs_fs__write_reps_container(svn_stream_t *stream,
- const svn_fs_fs__reps_builder_t *builder,
- apr_pool_t *pool)
+svn_fs_x__write_reps_container(svn_stream_t *stream,
+ const svn_fs_x__reps_builder_t *builder,
+ apr_pool_t *pool)
{
int i;
svn_packed__data_root_t *root = svn_packed__data_create_root(pool);
@@ -735,10 +735,10 @@ svn_fs_fs__write_reps_container(svn_stre
}
svn_error_t *
-svn_fs_fs__read_reps_container(svn_fs_fs__reps_t **container,
- svn_stream_t *stream,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_fs_x__read_reps_container(svn_fs_x__reps_t **container,
+ svn_stream_t *stream,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
apr_size_t i;
@@ -746,7 +746,7 @@ svn_fs_fs__read_reps_container(svn_fs_fs
apr_uint32_t *first_instructions;
instruction_t *instructions;
- svn_fs_fs__reps_t *reps = apr_pcalloc(result_pool, sizeof(*reps));
+ svn_fs_x__reps_t *reps = apr_pcalloc(result_pool, sizeof(*reps));
svn_packed__data_root_t *root;
svn_packed__int_stream_t *bases_stream;
@@ -821,12 +821,12 @@ svn_fs_fs__read_reps_container(svn_fs_fs
}
svn_error_t *
-svn_fs_fs__serialize_reps_container(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool)
+svn_fs_x__serialize_reps_container(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool)
{
- svn_fs_fs__reps_t *reps = in;
+ svn_fs_x__reps_t *reps = in;
svn_stringbuf_t *serialized;
/* make a guesstimate on the size of the serialized data. Erring on the
@@ -865,12 +865,12 @@ svn_fs_fs__serialize_reps_container(void
}
svn_error_t *
-svn_fs_fs__deserialize_reps_container(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool)
+svn_fs_x__deserialize_reps_container(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool)
{
- svn_fs_fs__reps_t *reps = (svn_fs_fs__reps_t *)data;
+ svn_fs_x__reps_t *reps = (svn_fs_x__reps_t *)data;
/* de-serialize sub-structures */
svn_temp_deserializer__resolve(reps, (void **)&reps->text);
@@ -885,17 +885,17 @@ svn_fs_fs__deserialize_reps_container(vo
}
svn_error_t *
-svn_fs_fs__reps_get_func(void **out,
- const void *data,
- apr_size_t data_len,
- void *baton,
- apr_pool_t *pool)
+svn_fs_x__reps_get_func(void **out,
+ const void *data,
+ apr_size_t data_len,
+ void *baton,
+ apr_pool_t *pool)
{
- svn_fs_fs__reps_baton_t *reps_baton = baton;
+ svn_fs_x__reps_baton_t *reps_baton = baton;
/* get a usable reps structure */
- const svn_fs_fs__reps_t *cached = data;
- svn_fs_fs__reps_t *reps = apr_pmemdup(pool, cached, sizeof(*reps));
+ const svn_fs_x__reps_t *cached = data;
+ svn_fs_x__reps_t *reps = apr_pmemdup(pool, cached, sizeof(*reps));
reps->text
= svn_temp_deserializer__ptr(cached, (const void **)&cached->text);
@@ -909,8 +909,8 @@ svn_fs_fs__reps_get_func(void **out,
(const void **)&cached->instructions);
/* return an extractor for the selected item */
- SVN_ERR(svn_fs_fs__reps_get((svn_fs_fs__rep_extractor_t **)out,
- reps_baton->fs, reps, reps_baton->idx, pool));
+ SVN_ERR(svn_fs_x__reps_get((svn_fs_x__rep_extractor_t **)out,
+ reps_baton->fs, reps, reps_baton->idx, pool));
return SVN_NO_ERROR;
}
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.h?rev=1498157&r1=1498156&r2=1498157&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/reps.h Sun Jun 30 17:01:16 2013
@@ -47,35 +47,35 @@
/* A write-only constructor object for representation containers.
*/
-typedef struct svn_fs_fs__reps_builder_t svn_fs_fs__reps_builder_t;
+typedef struct svn_fs_x__reps_builder_t svn_fs_x__reps_builder_t;
/* A read-only representation container -
* an opaque collection of fulltexts, i.e. byte strings.
*/
-typedef struct svn_fs_fs__reps_t svn_fs_fs__reps_t;
+typedef struct svn_fs_x__reps_t svn_fs_x__reps_t;
/* The fulltext extractor utility object.
*/
-typedef struct svn_fs_fs__rep_extractor_t svn_fs_fs__rep_extractor_t;
+typedef struct svn_fs_x__rep_extractor_t svn_fs_x__rep_extractor_t;
-/* Baton type to be passed to svn_fs_fs__reps_get_func.
+/* Baton type to be passed to svn_fs_x__reps_get_func.
*/
-typedef struct svn_fs_fs__reps_baton_t
+typedef struct svn_fs_x__reps_baton_t
{
/* filesystem the resulting extractor shall operate on */
svn_fs_t *fs;
/* element index of the item to extract from the container */
apr_size_t idx;
-} svn_fs_fs__reps_baton_t;
+} svn_fs_x__reps_baton_t;
/* Create and populate noderev containers. */
/* Create and return a new builder object, allocated in POOL.
*/
-svn_fs_fs__reps_builder_t *
-svn_fs_fs__reps_builder_create(svn_fs_t *fs,
- apr_pool_t *pool);
+svn_fs_x__reps_builder_t *
+svn_fs_x__reps_builder_create(svn_fs_t *fs,
+ apr_pool_t *pool);
/* To BUILDER, add reference to the fulltext currently stored in
* representation REP. Substrings matching with any of the base reps
@@ -90,23 +90,23 @@ svn_fs_fs__reps_builder_create(svn_fs_t
* Use SCRATCH_POOL for temporary allocations.
*/
svn_error_t *
-svn_fs_fs__reps_add_base(svn_fs_fs__reps_builder_t *builder,
- representation_t *rep,
- int priority,
- apr_pool_t *scratch_pool);
+svn_fs_x__reps_add_base(svn_fs_x__reps_builder_t *builder,
+ representation_t *rep,
+ int priority,
+ apr_pool_t *scratch_pool);
/* Add the byte string CONTENTS to BUILDER. Return the item index under
* which the fulltext can be retrieved from the final container.
*/
apr_size_t
-svn_fs_fs__reps_add(svn_fs_fs__reps_builder_t *builder,
- const svn_string_t *contents);
+svn_fs_x__reps_add(svn_fs_x__reps_builder_t *builder,
+ const svn_string_t *contents);
/* Return a rough estimate in bytes for the serialized representation
* of BUILDER.
*/
apr_size_t
-svn_fs_fs__reps_estimate_size(const svn_fs_fs__reps_builder_t *builder);
+svn_fs_x__reps_estimate_size(const svn_fs_x__reps_builder_t *builder);
/* Read from representation containers. */
@@ -114,11 +114,11 @@ svn_fs_fs__reps_estimate_size(const svn_
* allocated in POOL and return it in *EXTRACTOR.
*/
svn_error_t *
-svn_fs_fs__reps_get(svn_fs_fs__rep_extractor_t **extractor,
- svn_fs_t *fs,
- const svn_fs_fs__reps_t *container,
- apr_size_t idx,
- apr_pool_t *pool);
+svn_fs_x__reps_get(svn_fs_x__rep_extractor_t **extractor,
+ svn_fs_t *fs,
+ const svn_fs_x__reps_t *container,
+ apr_size_t idx,
+ apr_pool_t *pool);
/* Let the EXTRACTOR object fetch all parts of the desired fulltext and
* return the latter in *CONTENTS. If SIZE is not 0, return SIZE bytes
@@ -130,12 +130,12 @@ svn_fs_fs__reps_get(svn_fs_fs__rep_extra
* Note, you may not run this inside a cache access function.
*/
svn_error_t *
-svn_fs_fs__extractor_drive(svn_stringbuf_t** contents,
- svn_fs_fs__rep_extractor_t* extractor,
- apr_size_t start_offset,
- apr_size_t size,
- apr_pool_t* result_pool,
- apr_pool_t* scratch_pool);
+svn_fs_x__extractor_drive(svn_stringbuf_t** contents,
+ svn_fs_x__rep_extractor_t* extractor,
+ apr_size_t start_offset,
+ apr_size_t size,
+ apr_pool_t* result_pool,
+ apr_pool_t* scratch_pool);
/* I/O interface. */
@@ -143,47 +143,47 @@ svn_fs_fs__extractor_drive(svn_stringbuf
* BUILDER to STREAM. Use POOL for temporary allocations.
*/
svn_error_t *
-svn_fs_fs__write_reps_container(svn_stream_t *stream,
- const svn_fs_fs__reps_builder_t *builder,
- apr_pool_t *pool);
+svn_fs_x__write_reps_container(svn_stream_t *stream,
+ const svn_fs_x__reps_builder_t *builder,
+ apr_pool_t *pool);
/* Read a representations container from its serialized representation in
* STREAM. Allocate the result in RESULT_POOL and return it in *CONTAINER.
* Use SCRATCH_POOL for temporary allocations.
*/
svn_error_t *
-svn_fs_fs__read_reps_container(svn_fs_fs__reps_t **container,
- svn_stream_t *stream,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+svn_fs_x__read_reps_container(svn_fs_x__reps_t **container,
+ svn_stream_t *stream,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
-/* Implements #svn_cache__serialize_func_t for svn_fs_fs__reps_t objects.
+/* Implements #svn_cache__serialize_func_t for svn_fs_x__reps_t objects.
*/
svn_error_t *
-svn_fs_fs__serialize_reps_container(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool);
+svn_fs_x__serialize_reps_container(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool);
-/* Implements #svn_cache__deserialize_func_t for svn_fs_fs__reps_t objects.
+/* Implements #svn_cache__deserialize_func_t for svn_fs_x__reps_t objects.
*/
svn_error_t *
-svn_fs_fs__deserialize_reps_container(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool);
+svn_fs_x__deserialize_reps_container(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool);
-/* Implements svn_cache__partial_getter_func_t for svn_fs_fs__reps_t,
- * setting *OUT to an svn_fs_fs__rep_extractor_t object defined by the
- * svn_fs_fs__reps_baton_t passed in as *BATON. This function is similar
- * to svn_fs_fs__reps_get but operates on the cache serialized
+/* Implements svn_cache__partial_getter_func_t for svn_fs_x__reps_t,
+ * setting *OUT to an svn_fs_x__rep_extractor_t object defined by the
+ * svn_fs_x__reps_baton_t passed in as *BATON. This function is similar
+ * to svn_fs_x__reps_get but operates on the cache serialized
* representation of the container.
*/
svn_error_t *
-svn_fs_fs__reps_get_func(void **out,
- const void *data,
- apr_size_t data_len,
- void *baton,
- apr_pool_t *pool);
+svn_fs_x__reps_get_func(void **out,
+ const void *data,
+ apr_size_t data_len,
+ void *baton,
+ apr_pool_t *pool);
#endif
\ No newline at end of file
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c?rev=1498157&r1=1498156&r2=1498157&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c Sun Jun 30 17:01:16 2013
@@ -56,7 +56,7 @@ upgrade_pack_revprops(svn_fs_t *fs,
void *cancel_baton,
apr_pool_t *scratch_pool)
{
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
const char *revprops_shard_path;
const char *revprops_pack_file_dir;
apr_int64_t shard;
@@ -107,7 +107,7 @@ upgrade_cleanup_pack_revprops(svn_fs_t *
void *cancel_baton,
apr_pool_t *scratch_pool)
{
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
const char *revprops_shard_path;
apr_int64_t shard;
apr_int64_t first_unpacked_shard
@@ -203,7 +203,7 @@ read_revprop_generation_file(apr_int64_t
apr_file_t *file;
char buf[80];
apr_size_t len;
- const char *path = path_revprop_generation(fs, pool);
+ const char *path = svn_fs_x__path_revprop_generation(fs, pool);
err = svn_io_file_open(&file, path,
APR_READ | APR_BUFFERED,
@@ -221,8 +221,8 @@ read_revprop_generation_file(apr_int64_t
SVN_ERR(svn_io_read_length_line(file, buf, &len, pool));
/* Check that the first line contains only digits. */
- SVN_ERR(check_file_buffer_numeric(buf, 0, path,
- "Revprop Generation", pool));
+ SVN_ERR(svn_fs_x__check_file_buffer_numeric(buf, 0, path,
+ "Revprop Generation", pool));
SVN_ERR(svn_cstring_atoi64(current, buf));
return svn_io_file_close(file, pool);
@@ -239,7 +239,7 @@ write_revprop_generation_file(svn_fs_t *
apr_size_t len = svn__i64toa(buf, current);
buf[len] = '\n';
- SVN_ERR(svn_io_write_atomic(path_revprop_generation(fs, pool),
+ SVN_ERR(svn_io_write_atomic(svn_fs_x__path_revprop_generation(fs, pool),
buf, len + 1,
NULL /* copy_perms */, pool));
@@ -250,7 +250,7 @@ write_revprop_generation_file(svn_fs_t *
static svn_error_t *
ensure_revprop_namespace(svn_fs_t *fs)
{
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
return ffd->revprop_namespace == NULL
? svn_atomic_namespace__create(&ffd->revprop_namespace,
@@ -277,7 +277,7 @@ cleanup_revprop_namespace(svn_fs_t *fs)
static svn_error_t *
ensure_revprop_generation(svn_fs_t *fs, apr_pool_t *pool)
{
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
SVN_ERR(ensure_revprop_namespace(fs));
if (ffd->revprop_generation == NULL)
@@ -310,7 +310,7 @@ ensure_revprop_generation(svn_fs_t *fs,
static svn_error_t *
ensure_revprop_timeout(svn_fs_t *fs)
{
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
SVN_ERR(ensure_revprop_namespace(fs));
return ffd->revprop_timeout == NULL
@@ -345,7 +345,7 @@ log_revprop_cache_init_warning(svn_fs_t
static svn_boolean_t
has_revprop_cache(svn_fs_t *fs, apr_pool_t *pool)
{
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
svn_error_t *error;
/* is the cache (still) enabled? */
@@ -393,7 +393,7 @@ typedef struct revprop_generation_fixup_
apr_int64_t *generation;
/* containing the revprop_generation member to query */
- fs_fs_data_t *ffd;
+ fs_x_data_t *ffd;
} revprop_generation_upgrade_t;
/* If the revprop generation has an odd value, it means the original writer
@@ -435,7 +435,7 @@ read_revprop_generation(apr_int64_t *gen
apr_pool_t *pool)
{
apr_int64_t current = 0;
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
/* read the current revprop generation number */
SVN_ERR(ensure_revprop_generation(fs, pool));
@@ -466,8 +466,8 @@ read_revprop_generation(apr_int64_t *gen
if (ffd->has_write_lock)
SVN_ERR(revprop_generation_fixup(&baton, pool));
else
- SVN_ERR(svn_fs_fs__with_write_lock(fs, revprop_generation_fixup,
- &baton, pool));
+ SVN_ERR(svn_fs_x__with_write_lock(fs, revprop_generation_fixup,
+ &baton, pool));
}
}
@@ -484,7 +484,7 @@ static svn_error_t *
begin_revprop_change(svn_fs_t *fs, apr_pool_t *pool)
{
apr_int64_t current;
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
/* set the timeout for the write operation */
SVN_ERR(ensure_revprop_timeout(fs));
@@ -515,7 +515,7 @@ static svn_error_t *
end_revprop_change(svn_fs_t *fs, apr_pool_t *pool)
{
apr_int64_t current = 1;
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
/* set the revprop generation to an even value to indicate
* that a write has been completed
@@ -608,7 +608,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_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
pair_cache_key_t key = { 0 };
key.revision = revision;
@@ -644,11 +644,11 @@ read_non_packed_revprop(apr_hash_t **pro
for (i = 0; i < RECOVERABLE_RETRY_COUNT && !missing && !content; ++i)
{
svn_pool_clear(iterpool);
- SVN_ERR(try_stringbuf_from_file(&content,
- &missing,
- path_revprops(fs, rev, iterpool),
- i + 1 < RECOVERABLE_RETRY_COUNT,
- iterpool));
+ SVN_ERR(svn_fs_x__try_stringbuf_from_file(&content,
+ &missing,
+ svn_fs_x__path_revprops(fs, rev, iterpool),
+ i + 1 < RECOVERABLE_RETRY_COUNT,
+ iterpool));
}
if (content)
@@ -670,16 +670,17 @@ get_revprop_packname(svn_fs_t *fs,
apr_pool_t *pool,
apr_pool_t *scratch_pool)
{
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
svn_stringbuf_t *content = NULL;
const char *manifest_file_path;
int idx;
/* read content of the manifest file */
- revprops->folder = path_revprops_pack_shard(fs, revprops->revision, pool);
+ revprops->folder
+ = svn_fs_x__path_revprops_pack_shard(fs, revprops->revision, pool);
manifest_file_path = svn_dirent_join(revprops->folder, PATH_MANIFEST, pool);
- SVN_ERR(read_content(&content, manifest_file_path, pool));
+ SVN_ERR(svn_fs_x__read_content(&content, manifest_file_path, pool));
/* parse the manifest. Every line is a file name */
revprops->manifest = apr_array_make(pool, ffd->max_files_per_dir,
@@ -739,8 +740,9 @@ parse_packed_revprops(svn_fs_t *fs,
/* read first revision number and number of revisions in the pack */
stream = svn_stream_from_stringbuf(uncompressed, scratch_pool);
- SVN_ERR(read_number_from_stream(&first_rev, NULL, stream, iterpool));
- SVN_ERR(read_number_from_stream(&count, NULL, stream, iterpool));
+ SVN_ERR(svn_fs_x__read_number_from_stream(&first_rev, NULL, stream,
+ iterpool));
+ SVN_ERR(svn_fs_x__read_number_from_stream(&count, NULL, stream, iterpool));
/* make PACKED_REVPROPS point to the first char after the header.
* This is where the serialized revprops are. */
@@ -772,7 +774,8 @@ parse_packed_revprops(svn_fs_t *fs,
svn_revnum_t revision = (svn_revnum_t)(first_rev + i);
/* read & check the serialized size */
- SVN_ERR(read_number_from_stream(&size, NULL, stream, iterpool));
+ SVN_ERR(svn_fs_x__read_number_from_stream(&size, NULL, stream,
+ iterpool));
if (size + offset > (apr_int64_t)revprops->packed_revprops->len)
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
_("Packed revprop size exceeds pack file size"));
@@ -829,10 +832,10 @@ read_pack_revprop(packed_revprops_t **re
int i;
/* someone insisted that REV is packed. Double-check if necessary */
- if (!is_packed_revprop(fs, rev))
- SVN_ERR(update_min_unpacked_rev(fs, iterpool));
+ if (!svn_fs_x__is_packed_revprop(fs, rev))
+ SVN_ERR(svn_fs_x__update_min_unpacked_rev(fs, iterpool));
- if (!is_packed_revprop(fs, rev))
+ if (!svn_fs_x__is_packed_revprop(fs, rev))
return svn_error_createf(SVN_ERR_FS_NO_SUCH_REVISION, NULL,
_("No such packed revision %ld"), rev);
@@ -854,11 +857,11 @@ read_pack_revprop(packed_revprops_t **re
file_path = svn_dirent_join(result->folder,
result->filename,
iterpool);
- SVN_ERR(try_stringbuf_from_file(&result->packed_revprops,
- &missing,
- file_path,
- i + 1 < RECOVERABLE_RETRY_COUNT,
- pool));
+ SVN_ERR(svn_fs_x__try_stringbuf_from_file(&result->packed_revprops,
+ &missing,
+ file_path,
+ i + 1 < RECOVERABLE_RETRY_COUNT,
+ pool));
/* If we could not find the file, there was a write.
* So, we should refresh our revprop generation info as well such
@@ -898,14 +901,14 @@ get_revision_proplist(apr_hash_t **propl
svn_revnum_t rev,
apr_pool_t *pool)
{
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
apr_int64_t generation = 0;
/* not found, yet */
*proplist_p = NULL;
/* should they be available at all? */
- SVN_ERR(svn_fs_fs__ensure_revision_exists(rev, fs, pool));
+ SVN_ERR(svn_fs_x__ensure_revision_exists(rev, fs, pool));
/* Try cache lookup first. */
if (has_revprop_cache(fs, pool))
@@ -926,7 +929,7 @@ get_revision_proplist(apr_hash_t **propl
/* if REV had not been packed when we began, try reading it from the
* non-packed shard. If that fails, we will fall through to packed
* shard reads. */
- if (!is_packed_revprop(fs, rev))
+ if (!svn_fs_x__is_packed_revprop(fs, rev))
{
svn_error_t *err = read_non_packed_revprop(proplist_p, fs, rev,
generation, pool);
@@ -976,7 +979,7 @@ write_non_packed_revprop(const char **fi
apr_pool_t *pool)
{
svn_stream_t *stream;
- *final_path = path_revprops(fs, rev, pool);
+ *final_path = svn_fs_x__path_revprops(fs, rev, pool);
/* ### do we have a directory sitting around already? we really shouldn't
### have to get the dirname here. */
@@ -1013,7 +1016,8 @@ switch_to_new_revprop(svn_fs_t *fs,
if (bump_generation)
SVN_ERR(begin_revprop_change(fs, pool));
- SVN_ERR(move_into_place(tmp_path, final_path, perms_reference, pool));
+ SVN_ERR(svn_fs_x__move_into_place(tmp_path, final_path, perms_reference,
+ pool));
/* Indicate that the update (if relevant) has been completed. */
if (bump_generation)
@@ -1093,7 +1097,7 @@ repack_revprops(svn_fs_t *fs,
svn_stream_t *file_stream,
apr_pool_t *pool)
{
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
svn_stream_t *stream;
int i;
@@ -1216,7 +1220,7 @@ write_packed_revprop(const char **final_
apr_hash_t *proplist,
apr_pool_t *pool)
{
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
packed_revprops_t *revprops;
apr_int64_t generation = 0;
svn_stream_t *stream;
@@ -1369,10 +1373,10 @@ set_revision_proplist(svn_fs_t *fs,
const char *perms_reference;
apr_array_header_t *files_to_delete = NULL;
- SVN_ERR(svn_fs_fs__ensure_revision_exists(rev, fs, pool));
+ SVN_ERR(svn_fs_x__ensure_revision_exists(rev, fs, pool));
/* this info will not change while we hold the global FS write lock */
- is_packed = is_packed_revprop(fs, rev);
+ is_packed = svn_fs_x__is_packed_revprop(fs, rev);
/* Test whether revprops already exist for this revision.
* Only then will we need to bump the revprop generation. */
@@ -1385,8 +1389,8 @@ set_revision_proplist(svn_fs_t *fs,
else
{
svn_node_kind_t kind;
- SVN_ERR(svn_io_check_path(path_revprops(fs, rev, pool), &kind,
- pool));
+ SVN_ERR(svn_io_check_path(svn_fs_x__path_revprops(fs, rev, pool),
+ &kind, pool));
bump_generation = kind != svn_node_none;
}
}
@@ -1404,7 +1408,7 @@ set_revision_proplist(svn_fs_t *fs,
* file won't exist and therefore can't serve as its own reference.
* (Whereas the rev file should already exist at this point.)
*/
- perms_reference = svn_fs_fs__path_rev_absolute(fs, rev, pool);
+ perms_reference = svn_fs_x__path_rev_absolute(fs, rev, pool);
/* Now, switch to the new revprop data. */
SVN_ERR(switch_to_new_revprop(fs, final_path, tmp_path, perms_reference,
@@ -1423,18 +1427,18 @@ packed_revprop_available(svn_boolean_t *
svn_revnum_t revision,
apr_pool_t *pool)
{
- fs_fs_data_t *ffd = fs->fsap_data;
+ fs_x_data_t *ffd = fs->fsap_data;
svn_stringbuf_t *content = NULL;
/* try to read the manifest file */
- const char *folder = path_revprops_pack_shard(fs, revision, pool);
+ const char *folder = svn_fs_x__path_revprops_pack_shard(fs, revision, pool);
const char *manifest_path = svn_dirent_join(folder, PATH_MANIFEST, pool);
- svn_error_t *err = try_stringbuf_from_file(&content,
- missing,
- manifest_path,
- FALSE,
- pool);
+ svn_error_t *err = svn_fs_x__try_stringbuf_from_file(&content,
+ missing,
+ manifest_path,
+ FALSE,
+ pool);
/* if the manifest cannot be read, consider the pack files inaccessible
* even if the file itself exists. */
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.c?rev=1498157&r1=1498156&r2=1498157&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.c Sun Jun 30 17:01:16 2013
@@ -120,7 +120,7 @@ add_table(string_table_builder_t *builde
}
string_table_builder_t *
-svn_fs_fs__string_table_builder_create(apr_pool_t *pool)
+svn_fs_x__string_table_builder_create(apr_pool_t *pool)
{
string_table_builder_t *result = apr_palloc(pool, sizeof(*result));
result->pool = pool;
@@ -269,9 +269,9 @@ insert_string(builder_table_t *table,
}
apr_size_t
-svn_fs_fs__string_table_builder_add(string_table_builder_t *builder,
- const char *string,
- apr_size_t len)
+svn_fs_x__string_table_builder_add(string_table_builder_t *builder,
+ const char *string,
+ apr_size_t len)
{
apr_size_t result = -1;
builder_table_t *table = APR_ARRAY_IDX(builder->tables,
@@ -341,7 +341,7 @@ svn_fs_fs__string_table_builder_add(stri
}
apr_size_t
-svn_fs_fs__string_table_builder_estimate_size(string_table_builder_t *builder)
+svn_fs_x__string_table_builder_estimate_size(string_table_builder_t *builder)
{
apr_size_t total = 0;
int i;
@@ -449,8 +449,8 @@ create_table(string_sub_table_t *target,
}
string_table_t *
-svn_fs_fs__string_table_create(const string_table_builder_t *builder,
- apr_pool_t *pool)
+svn_fs_x__string_table_create(const string_table_builder_t *builder,
+ apr_pool_t *pool)
{
apr_size_t i;
@@ -534,10 +534,10 @@ table_copy_string(char *buffer,
}
const char*
-svn_fs_fs__string_table_get(const string_table_t *table,
- apr_size_t idx,
- apr_size_t *length,
- apr_pool_t *pool)
+svn_fs_x__string_table_get(const string_table_t *table,
+ apr_size_t idx,
+ apr_size_t *length,
+ apr_pool_t *pool)
{
apr_size_t table_number = idx >> TABLE_SHIFT;
apr_size_t sub_index = idx & STRING_INDEX_MASK;
@@ -578,9 +578,9 @@ svn_fs_fs__string_table_get(const string
}
svn_error_t *
-svn_fs_fs__write_string_table(svn_stream_t *stream,
- const string_table_t *table,
- apr_pool_t *pool)
+svn_fs_x__write_string_table(svn_stream_t *stream,
+ const string_table_t *table,
+ apr_pool_t *pool)
{
apr_size_t i, k;
@@ -647,10 +647,10 @@ svn_fs_fs__write_string_table(svn_stream
}
svn_error_t *
-svn_fs_fs__read_string_table(string_table_t **table_p,
- svn_stream_t *stream,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_fs_x__read_string_table(string_table_t **table_p,
+ svn_stream_t *stream,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
apr_size_t i, k;
@@ -738,8 +738,8 @@ svn_fs_fs__read_string_table(string_tabl
}
void
-svn_fs_fs__serialize_string_table(svn_temp_serializer__context_t *context,
- string_table_t **st)
+svn_fs_x__serialize_string_table(svn_temp_serializer__context_t *context,
+ string_table_t **st)
{
apr_size_t i, k;
string_table_t *string_table = *st;
@@ -791,8 +791,8 @@ svn_fs_fs__serialize_string_table(svn_te
}
void
-svn_fs_fs__deserialize_string_table(void *buffer,
- string_table_t **table)
+svn_fs_x__deserialize_string_table(void *buffer,
+ string_table_t **table)
{
apr_size_t i, k;
string_sub_table_t *sub_tables;
@@ -821,10 +821,10 @@ svn_fs_fs__deserialize_string_table(void
}
const char*
-svn_fs_fs__string_table_get_func(const string_table_t *table,
- apr_size_t idx,
- apr_size_t *length,
- apr_pool_t *pool)
+svn_fs_x__string_table_get_func(const string_table_t *table,
+ apr_size_t idx,
+ apr_size_t *length,
+ apr_pool_t *pool)
{
apr_size_t table_number = idx >> TABLE_SHIFT;
apr_size_t sub_index = idx & STRING_INDEX_MASK;
@@ -867,7 +867,7 @@ svn_fs_fs__string_table_get_func(const s
string_header_t *header;
apr_size_t len;
char *result;
-
+
/* construct a copy of our sub-table struct with SHORT_STRINGS
and DATA pointers resolved. Leave all other pointers as
they are. This allows us to use the same code for string
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h?rev=1498157&r1=1498156&r2=1498157&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h Sun Jun 30 17:01:16 2013
@@ -50,70 +50,70 @@ typedef struct string_table_t string_tab
/* Returns a new string table builder object, allocated in POOL.
*/
string_table_builder_t *
-svn_fs_fs__string_table_builder_create(apr_pool_t *pool);
+svn_fs_x__string_table_builder_create(apr_pool_t *pool);
/* Add an arbitrary NUL-terminated C-string STRING of the given length LEN
* to BUILDER. Return the index of that string in the future string table.
* If LEN is 0, determine the length of the C-string internally.
*/
apr_size_t
-svn_fs_fs__string_table_builder_add(string_table_builder_t *builder,
- const char *string,
- apr_size_t len);
+svn_fs_x__string_table_builder_add(string_table_builder_t *builder,
+ const char *string,
+ apr_size_t len);
/* Return an estimate for the on-disk size of the resulting string table.
* The estimate may err in both directions but tends to overestimate the
* space requirements for larger tables.
*/
apr_size_t
-svn_fs_fs__string_table_builder_estimate_size(string_table_builder_t *builder);
+svn_fs_x__string_table_builder_estimate_size(string_table_builder_t *builder);
/* From the given BUILDER object, create a string table object allocated
* in POOL that contains all strings previously added to BUILDER.
*/
string_table_t *
-svn_fs_fs__string_table_create(const string_table_builder_t *builder,
- apr_pool_t *pool);
+svn_fs_x__string_table_create(const string_table_builder_t *builder,
+ apr_pool_t *pool);
/* Extract string number INDEX from TABLE and return a copy of it allocated
* in POOL. If LENGTH is not NULL, set *LENGTH to strlen() of the result
* string. Returns an empty string for invalid indexes.
*/
const char*
-svn_fs_fs__string_table_get(const string_table_t *table,
- apr_size_t index,
- apr_size_t *length,
- apr_pool_t *pool);
+svn_fs_x__string_table_get(const string_table_t *table,
+ apr_size_t index,
+ apr_size_t *length,
+ apr_pool_t *pool);
/* Write a serialized representation of the string table TABLE to STREAM.
* Use POOL for temporary allocations.
*/
svn_error_t *
-svn_fs_fs__write_string_table(svn_stream_t *stream,
- const string_table_t *table,
- apr_pool_t *pool);
+svn_fs_x__write_string_table(svn_stream_t *stream,
+ const string_table_t *table,
+ apr_pool_t *pool);
/* Read the serialized string table representation from STREAM and return
* the resulting runtime representation in *TABLE_P. Allocate it in
* RESULT_POOL and use SCRATCH_POOL for temporary allocations.
*/
svn_error_t *
-svn_fs_fs__read_string_table(string_table_t **table_p,
- svn_stream_t *stream,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+svn_fs_x__read_string_table(string_table_t **table_p,
+ svn_stream_t *stream,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
/* Serialize string table *ST within the serialization CONTEXT.
*/
void
-svn_fs_fs__serialize_string_table(svn_temp_serializer__context_t *context,
- string_table_t **st);
+svn_fs_x__serialize_string_table(svn_temp_serializer__context_t *context,
+ string_table_t **st);
/* Deserialize string table *TABLE within the BUFFER.
*/
void
-svn_fs_fs__deserialize_string_table(void *buffer,
- string_table_t **table);
+svn_fs_x__deserialize_string_table(void *buffer,
+ string_table_t **table);
/* Extract string number INDEX from the cache serialized representation at
* TABLE and return a copy of it allocated in POOL. If LENGTH is not NULL,
@@ -121,10 +121,10 @@ svn_fs_fs__deserialize_string_table(void
* for invalid indexes.
*/
const char*
-svn_fs_fs__string_table_get_func(const string_table_t *table,
- apr_size_t idx,
- apr_size_t *length,
- apr_pool_t *pool);
+svn_fs_x__string_table_get_func(const string_table_t *table,
+ apr_size_t idx,
+ apr_size_t *length,
+ apr_pool_t *pool);
#ifdef __cplusplus
}
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.c?rev=1498157&r1=1498156&r2=1498157&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.c Sun Jun 30 17:01:16 2013
@@ -67,9 +67,9 @@ encode_number(apr_int64_t number, char *
}
const char*
-svn_fs_fs__combine_number_and_string(apr_int64_t number,
- const char *string,
- apr_pool_t *pool)
+svn_fs_x__combine_number_and_string(apr_int64_t number,
+ const char *string,
+ apr_pool_t *pool)
{
apr_size_t len = strlen(string);
@@ -145,8 +145,8 @@ serialize_representation(svn_temp_serial
}
void
-svn_fs_fs__serialize_apr_array(svn_temp_serializer__context_t *context,
- apr_array_header_t **a)
+svn_fs_x__serialize_apr_array(svn_temp_serializer__context_t *context,
+ apr_array_header_t **a)
{
const apr_array_header_t *array = *a;
@@ -169,9 +169,9 @@ svn_fs_fs__serialize_apr_array(svn_temp_
}
void
-svn_fs_fs__deserialize_apr_array(void *buffer,
- apr_array_header_t **array,
- apr_pool_t *pool)
+svn_fs_x__deserialize_apr_array(void *buffer,
+ apr_array_header_t **array,
+ apr_pool_t *pool)
{
svn_temp_deserializer__resolve(buffer, (void **)array);
if (*array == NULL)
@@ -230,7 +230,7 @@ serialize_dir_entry(svn_temp_serializer_
(const void * const *)entry_p,
sizeof(svn_fs_dirent_t));
- svn_fs_fs__id_serialize(context, &entry->id);
+ svn_fs_x__id_serialize(context, &entry->id);
svn_temp_serializer__add_string(context, &entry->name);
*length = (apr_uint32_t)( svn_temp_serializer__get_length(context)
@@ -324,7 +324,7 @@ deserialize_dir(void *buffer, hash_data_
/* pointer fixup */
svn_temp_deserializer__resolve(entry, (void **)&entry->name);
- svn_fs_fs__id_deserialize(entry, (svn_fs_id_t **)&entry->id);
+ svn_fs_x__id_deserialize(entry, (svn_fs_id_t **)&entry->id);
/* add the entry to the hash */
svn_hash_sets(result, entry->name, entry);
@@ -335,8 +335,8 @@ deserialize_dir(void *buffer, hash_data_
}
void
-svn_fs_fs__noderev_serialize(svn_temp_serializer__context_t *context,
- node_revision_t * const *noderev_p)
+svn_fs_x__noderev_serialize(svn_temp_serializer__context_t *context,
+ node_revision_t * const *noderev_p)
{
const node_revision_t *noderev = *noderev_p;
if (noderev == NULL)
@@ -348,8 +348,8 @@ svn_fs_fs__noderev_serialize(svn_temp_se
sizeof(*noderev));
/* serialize sub-structures */
- svn_fs_fs__id_serialize(context, &noderev->id);
- svn_fs_fs__id_serialize(context, &noderev->predecessor_id);
+ svn_fs_x__id_serialize(context, &noderev->id);
+ svn_fs_x__id_serialize(context, &noderev->predecessor_id);
serialize_representation(context, &noderev->prop_rep);
serialize_representation(context, &noderev->data_rep);
@@ -363,8 +363,8 @@ svn_fs_fs__noderev_serialize(svn_temp_se
void
-svn_fs_fs__noderev_deserialize(void *buffer,
- node_revision_t **noderev_p)
+svn_fs_x__noderev_deserialize(void *buffer,
+ node_revision_t **noderev_p)
{
node_revision_t *noderev;
@@ -378,8 +378,8 @@ svn_fs_fs__noderev_deserialize(void *buf
return;
/* fixup of sub-structures */
- svn_fs_fs__id_deserialize(noderev, (svn_fs_id_t **)&noderev->id);
- svn_fs_fs__id_deserialize(noderev, (svn_fs_id_t **)&noderev->predecessor_id);
+ svn_fs_x__id_deserialize(noderev, (svn_fs_id_t **)&noderev->id);
+ svn_fs_x__id_deserialize(noderev, (svn_fs_id_t **)&noderev->predecessor_id);
svn_temp_deserializer__resolve(noderev, (void **)&noderev->prop_rep);
svn_temp_deserializer__resolve(noderev, (void **)&noderev->data_rep);
@@ -427,12 +427,12 @@ serialize_txdeltawindow(svn_temp_seriali
}
svn_error_t *
-svn_fs_fs__serialize_txdelta_window(void **buffer,
- apr_size_t *buffer_size,
- void *item,
- apr_pool_t *pool)
+svn_fs_x__serialize_txdelta_window(void **buffer,
+ apr_size_t *buffer_size,
+ void *item,
+ apr_pool_t *pool)
{
- svn_fs_fs__txdelta_cached_window_t *window_info = item;
+ svn_fs_x__txdelta_cached_window_t *window_info = item;
svn_stringbuf_t *serialized;
/* initialize the serialization process and allocate a buffer large
@@ -459,16 +459,16 @@ svn_fs_fs__serialize_txdelta_window(void
}
svn_error_t *
-svn_fs_fs__deserialize_txdelta_window(void **item,
- void *buffer,
- apr_size_t buffer_size,
- apr_pool_t *pool)
+svn_fs_x__deserialize_txdelta_window(void **item,
+ void *buffer,
+ apr_size_t buffer_size,
+ apr_pool_t *pool)
{
svn_txdelta_window_t *window;
/* Copy the _full_ buffer as it also contains the sub-structures. */
- svn_fs_fs__txdelta_cached_window_t *window_info =
- (svn_fs_fs__txdelta_cached_window_t *)buffer;
+ svn_fs_x__txdelta_cached_window_t *window_info =
+ (svn_fs_x__txdelta_cached_window_t *)buffer;
/* pointer reference fixup */
svn_temp_deserializer__resolve(window_info,
@@ -486,10 +486,10 @@ svn_fs_fs__deserialize_txdelta_window(vo
}
svn_error_t *
-svn_fs_fs__serialize_manifest(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool)
+svn_fs_x__serialize_manifest(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool)
{
apr_array_header_t *manifest = in;
@@ -501,10 +501,10 @@ svn_fs_fs__serialize_manifest(void **dat
}
svn_error_t *
-svn_fs_fs__deserialize_manifest(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool)
+svn_fs_x__deserialize_manifest(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool)
{
apr_array_header_t *manifest = apr_array_make(pool, 1, sizeof(apr_off_t));
@@ -575,10 +575,10 @@ serialize_svn_string_array(svn_temp_seri
}
svn_error_t *
-svn_fs_fs__serialize_properties(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool)
+svn_fs_x__serialize_properties(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool)
{
apr_hash_t *hash = in;
properties_data_t properties;
@@ -619,10 +619,10 @@ svn_fs_fs__serialize_properties(void **d
}
svn_error_t *
-svn_fs_fs__deserialize_properties(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool)
+svn_fs_x__deserialize_properties(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool)
{
apr_hash_t *hash = svn_hash__make(pool);
properties_data_t *properties = (properties_data_t *)data;
@@ -654,10 +654,10 @@ svn_fs_fs__deserialize_properties(void *
}
svn_error_t *
-svn_fs_fs__serialize_id(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool)
+svn_fs_x__serialize_id(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool)
{
const svn_fs_id_t *id = in;
svn_stringbuf_t *serialized;
@@ -667,7 +667,7 @@ svn_fs_fs__serialize_id(void **data,
svn_temp_serializer__init(NULL, 0, 250, pool);
/* serialize the id */
- svn_fs_fs__id_serialize(context, &id);
+ svn_fs_x__id_serialize(context, &id);
/* return serialized data */
serialized = svn_temp_serializer__get(context);
@@ -678,16 +678,16 @@ svn_fs_fs__serialize_id(void **data,
}
svn_error_t *
-svn_fs_fs__deserialize_id(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool)
+svn_fs_x__deserialize_id(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool)
{
/* Copy the _full_ buffer as it also contains the sub-structures. */
svn_fs_id_t *id = (svn_fs_id_t *)data;
/* fixup of all pointers etc. */
- svn_fs_fs__id_deserialize(id, &id);
+ svn_fs_x__id_deserialize(id, &id);
/* done */
*out = id;
@@ -697,10 +697,10 @@ svn_fs_fs__deserialize_id(void **out,
/** Caching node_revision_t objects. **/
svn_error_t *
-svn_fs_fs__serialize_node_revision(void **buffer,
- apr_size_t *buffer_size,
- void *item,
- apr_pool_t *pool)
+svn_fs_x__serialize_node_revision(void **buffer,
+ apr_size_t *buffer_size,
+ void *item,
+ apr_pool_t *pool)
{
svn_stringbuf_t *serialized;
node_revision_t *noderev = item;
@@ -713,7 +713,7 @@ svn_fs_fs__serialize_node_revision(void
pool);
/* serialize the noderev */
- svn_fs_fs__noderev_serialize(context, &noderev);
+ svn_fs_x__noderev_serialize(context, &noderev);
/* return serialized data */
serialized = svn_temp_serializer__get(context);
@@ -724,16 +724,16 @@ svn_fs_fs__serialize_node_revision(void
}
svn_error_t *
-svn_fs_fs__deserialize_node_revision(void **item,
- void *buffer,
- apr_size_t buffer_size,
- apr_pool_t *pool)
+svn_fs_x__deserialize_node_revision(void **item,
+ void *buffer,
+ apr_size_t buffer_size,
+ apr_pool_t *pool)
{
/* Copy the _full_ buffer as it also contains the sub-structures. */
node_revision_t *noderev = (node_revision_t *)buffer;
/* fixup of all pointers etc. */
- svn_fs_fs__noderev_deserialize(noderev, &noderev);
+ svn_fs_x__noderev_deserialize(noderev, &noderev);
/* done */
*item = noderev;
@@ -757,10 +757,10 @@ return_serialized_dir_context(svn_temp_s
}
svn_error_t *
-svn_fs_fs__serialize_dir_entries(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool)
+svn_fs_x__serialize_dir_entries(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool)
{
apr_hash_t *dir = in;
@@ -772,10 +772,10 @@ svn_fs_fs__serialize_dir_entries(void **
}
svn_error_t *
-svn_fs_fs__deserialize_dir_entries(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool)
+svn_fs_x__deserialize_dir_entries(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool)
{
/* Copy the _full_ buffer as it also contains the sub-structures. */
hash_data_t *hash_data = (hash_data_t *)data;
@@ -787,11 +787,11 @@ svn_fs_fs__deserialize_dir_entries(void
}
svn_error_t *
-svn_fs_fs__get_sharded_offset(void **out,
- const void *data,
- apr_size_t data_len,
- void *baton,
- apr_pool_t *pool)
+svn_fs_x__get_sharded_offset(void **out,
+ const void *data,
+ apr_size_t data_len,
+ void *baton,
+ apr_pool_t *pool)
{
const apr_off_t *manifest = data;
apr_int64_t shard_pos = *(apr_int64_t *)baton;
@@ -848,11 +848,11 @@ find_entry(svn_fs_dirent_t **entries,
}
svn_error_t *
-svn_fs_fs__extract_dir_entry(void **out,
- const void *data,
- apr_size_t data_len,
- void *baton,
- apr_pool_t *pool)
+svn_fs_x__extract_dir_entry(void **out,
+ const void *data,
+ apr_size_t data_len,
+ void *baton,
+ apr_pool_t *pool)
{
const hash_data_t *hash_data = data;
const char* name = baton;
@@ -891,14 +891,14 @@ svn_fs_fs__extract_dir_entry(void **out,
memcpy(new_entry, source, size);
svn_temp_deserializer__resolve(new_entry, (void **)&new_entry->name);
- svn_fs_fs__id_deserialize(new_entry, (svn_fs_id_t **)&new_entry->id);
+ svn_fs_x__id_deserialize(new_entry, (svn_fs_id_t **)&new_entry->id);
*(svn_fs_dirent_t **)out = new_entry;
}
return SVN_NO_ERROR;
}
-/* Utility function for svn_fs_fs__replace_dir_entry that implements the
+/* Utility function for svn_fs_x__replace_dir_entry that implements the
* modification as a simply deserialize / modify / serialize sequence.
*/
static svn_error_t *
@@ -911,20 +911,20 @@ slowly_replace_dir_entry(void **data,
hash_data_t *hash_data = (hash_data_t *)*data;
apr_hash_t *dir;
- SVN_ERR(svn_fs_fs__deserialize_dir_entries((void **)&dir,
- *data,
- hash_data->len,
- pool));
+ SVN_ERR(svn_fs_x__deserialize_dir_entries((void **)&dir,
+ *data,
+ hash_data->len,
+ pool));
svn_hash_sets(dir, replace_baton->name, replace_baton->new_entry);
- return svn_fs_fs__serialize_dir_entries(data, data_len, dir, pool);
+ return svn_fs_x__serialize_dir_entries(data, data_len, dir, pool);
}
svn_error_t *
-svn_fs_fs__replace_dir_entry(void **data,
- apr_size_t *data_len,
- void *baton,
- apr_pool_t *pool)
+svn_fs_x__replace_dir_entry(void **data,
+ apr_size_t *data_len,
+ void *baton,
+ apr_pool_t *pool)
{
replace_baton_t *replace_baton = (replace_baton_t *)baton;
hash_data_t *hash_data = (hash_data_t *)*data;
@@ -1026,30 +1026,30 @@ svn_fs_fs__replace_dir_entry(void **data
}
svn_error_t *
-svn_fs_fs__serialize_rep_header(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool)
+svn_fs_x__serialize_rep_header(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool)
{
- svn_fs_fs__rep_header_t *copy = apr_palloc(pool, sizeof(*copy));
- *copy = *(svn_fs_fs__rep_header_t *)in;
+ svn_fs_x__rep_header_t *copy = apr_palloc(pool, sizeof(*copy));
+ *copy = *(svn_fs_x__rep_header_t *)in;
- *data_len = sizeof(svn_fs_fs__rep_header_t);
+ *data_len = sizeof(svn_fs_x__rep_header_t);
*data = copy;
return SVN_NO_ERROR;
}
svn_error_t *
-svn_fs_fs__deserialize_rep_header(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool)
+svn_fs_x__deserialize_rep_header(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool)
{
- svn_fs_fs__rep_header_t *copy = apr_palloc(pool, sizeof(*copy));
+ svn_fs_x__rep_header_t *copy = apr_palloc(pool, sizeof(*copy));
SVN_ERR_ASSERT(data_len == sizeof(*copy));
- *copy = *(svn_fs_fs__rep_header_t *)data;
+ *copy = *(svn_fs_x__rep_header_t *)data;
*out = data;
return SVN_NO_ERROR;
@@ -1072,7 +1072,7 @@ serialize_change(svn_temp_serializer__co
sizeof(*change));
/* serialize sub-structures */
- svn_fs_fs__id_serialize(context, &change->info.node_rev_id);
+ svn_fs_x__id_serialize(context, &change->info.node_rev_id);
svn_temp_serializer__add_string(context, &change->path.data);
svn_temp_serializer__add_string(context, &change->info.copyfrom_path);
@@ -1097,7 +1097,7 @@ deserialize_change(void *buffer, change_
return;
/* fix-up of sub-structures */
- svn_fs_fs__id_deserialize(change, (svn_fs_id_t **)&change->info.node_rev_id);
+ svn_fs_x__id_deserialize(change, (svn_fs_id_t **)&change->info.node_rev_id);
svn_temp_deserializer__resolve(change, (void **)&change->path.data);
svn_temp_deserializer__resolve(change, (void **)&change->info.copyfrom_path);
@@ -1116,10 +1116,10 @@ typedef struct changes_data_t
} changes_data_t;
svn_error_t *
-svn_fs_fs__serialize_changes(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool)
+svn_fs_x__serialize_changes(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool)
{
apr_array_header_t *array = in;
changes_data_t changes;
@@ -1160,10 +1160,10 @@ svn_fs_fs__serialize_changes(void **data
}
svn_error_t *
-svn_fs_fs__deserialize_changes(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool)
+svn_fs_x__deserialize_changes(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool)
{
int i;
changes_data_t *changes = (changes_data_t *)data;
@@ -1209,10 +1209,10 @@ typedef struct mergeinfo_data_t
} mergeinfo_data_t;
svn_error_t *
-svn_fs_fs__serialize_mergeinfo(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool)
+svn_fs_x__serialize_mergeinfo(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool)
{
svn_mergeinfo_t mergeinfo = in;
mergeinfo_data_t merges;
@@ -1294,10 +1294,10 @@ svn_fs_fs__serialize_mergeinfo(void **da
}
svn_error_t *
-svn_fs_fs__deserialize_mergeinfo(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool)
+svn_fs_x__deserialize_mergeinfo(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool)
{
unsigned i;
int k, n;
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.h?rev=1498157&r1=1498156&r2=1498157&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/temp_serializer.h Sun Jun 30 17:01:16 2013
@@ -31,40 +31,40 @@
* Allocate temporaries as well as the result from @a pool.
*/
const char*
-svn_fs_fs__combine_number_and_string(apr_int64_t number,
- const char *string,
- apr_pool_t *pool);
+svn_fs_x__combine_number_and_string(apr_int64_t number,
+ const char *string,
+ apr_pool_t *pool);
/**
* Serialize a @a noderev_p within the serialization @a context.
*/
void
-svn_fs_fs__noderev_serialize(struct svn_temp_serializer__context_t *context,
- node_revision_t * const *noderev_p);
+svn_fs_x__noderev_serialize(struct svn_temp_serializer__context_t *context,
+ node_revision_t * const *noderev_p);
/**
* Deserialize a @a noderev_p within the @a buffer.
*/
void
-svn_fs_fs__noderev_deserialize(void *buffer,
- node_revision_t **noderev_p);
+svn_fs_x__noderev_deserialize(void *buffer,
+ node_revision_t **noderev_p);
/**
* Serialize APR array @a *a within the serialization @a context.
* The elements within the array must not contain pointers.
*/
void
-svn_fs_fs__serialize_apr_array(struct svn_temp_serializer__context_t *context,
- apr_array_header_t **a);
+svn_fs_x__serialize_apr_array(struct svn_temp_serializer__context_t *context,
+ apr_array_header_t **a);
/**
* Deserialize APR @a *array within the @a buffer. Set its pool member to
* @a pool. The elements within the array must not contain pointers.
*/
void
-svn_fs_fs__deserialize_apr_array(void *buffer,
- apr_array_header_t **array,
- apr_pool_t *pool);
+svn_fs_x__deserialize_apr_array(void *buffer,
+ apr_array_header_t **array,
+ apr_pool_t *pool);
/**
@@ -81,132 +81,132 @@ typedef struct
/* the revision file read pointer position right after reading the window */
apr_off_t end_offset;
-} svn_fs_fs__txdelta_cached_window_t;
+} svn_fs_x__txdelta_cached_window_t;
/**
* Implements #svn_cache__serialize_func_t for
- * #svn_fs_fs__txdelta_cached_window_t.
+ * #svn_fs_x__txdelta_cached_window_t.
*/
svn_error_t *
-svn_fs_fs__serialize_txdelta_window(void **buffer,
- apr_size_t *buffer_size,
- void *item,
- apr_pool_t *pool);
+svn_fs_x__serialize_txdelta_window(void **buffer,
+ apr_size_t *buffer_size,
+ void *item,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__deserialize_func_t for
- * #svn_fs_fs__txdelta_cached_window_t.
+ * #svn_fs_x__txdelta_cached_window_t.
*/
svn_error_t *
-svn_fs_fs__deserialize_txdelta_window(void **item,
- void *buffer,
- apr_size_t buffer_size,
- apr_pool_t *pool);
+svn_fs_x__deserialize_txdelta_window(void **item,
+ void *buffer,
+ apr_size_t buffer_size,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__serialize_func_t for a manifest
* (@a in is an #apr_array_header_t of apr_off_t elements).
*/
svn_error_t *
-svn_fs_fs__serialize_manifest(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool);
+svn_fs_x__serialize_manifest(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__deserialize_func_t for a manifest
* (@a *out is an #apr_array_header_t of apr_off_t elements).
*/
svn_error_t *
-svn_fs_fs__deserialize_manifest(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool);
+svn_fs_x__deserialize_manifest(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__serialize_func_t for a properties hash
* (@a in is an #apr_hash_t of svn_string_t elements, keyed by const char*).
*/
svn_error_t *
-svn_fs_fs__serialize_properties(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool);
+svn_fs_x__serialize_properties(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__deserialize_func_t for a properties hash
* (@a *out is an #apr_hash_t of svn_string_t elements, keyed by const char*).
*/
svn_error_t *
-svn_fs_fs__deserialize_properties(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool);
+svn_fs_x__deserialize_properties(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__serialize_func_t for #svn_fs_id_t
*/
svn_error_t *
-svn_fs_fs__serialize_id(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool);
+svn_fs_x__serialize_id(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__deserialize_func_t for #svn_fs_id_t
*/
svn_error_t *
-svn_fs_fs__deserialize_id(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool);
+svn_fs_x__deserialize_id(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__serialize_func_t for #node_revision_t
*/
svn_error_t *
-svn_fs_fs__serialize_node_revision(void **buffer,
- apr_size_t *buffer_size,
- void *item,
- apr_pool_t *pool);
+svn_fs_x__serialize_node_revision(void **buffer,
+ apr_size_t *buffer_size,
+ void *item,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__deserialize_func_t for #node_revision_t
*/
svn_error_t *
-svn_fs_fs__deserialize_node_revision(void **item,
- void *buffer,
- apr_size_t buffer_size,
- apr_pool_t *pool);
+svn_fs_x__deserialize_node_revision(void **item,
+ void *buffer,
+ apr_size_t buffer_size,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__serialize_func_t for a directory contents hash
*/
svn_error_t *
-svn_fs_fs__serialize_dir_entries(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool);
+svn_fs_x__serialize_dir_entries(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__deserialize_func_t for a directory contents hash
*/
svn_error_t *
-svn_fs_fs__deserialize_dir_entries(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool);
+svn_fs_x__deserialize_dir_entries(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__partial_getter_func_t. Set (apr_off_t) @a *out
* to the element indexed by (apr_int64_t) @a *baton within the
* serialized manifest array @a data and @a data_len. */
svn_error_t *
-svn_fs_fs__get_sharded_offset(void **out,
- const void *data,
- apr_size_t data_len,
- void *baton,
- apr_pool_t *pool);
+svn_fs_x__get_sharded_offset(void **out,
+ const void *data,
+ apr_size_t data_len,
+ void *baton,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__partial_getter_func_t for a single
@@ -214,11 +214,11 @@ svn_fs_fs__get_sharded_offset(void **out
* identified by its name (const char @a *baton).
*/
svn_error_t *
-svn_fs_fs__extract_dir_entry(void **out,
- const void *data,
- apr_size_t data_len,
- void *baton,
- apr_pool_t *pool);
+svn_fs_x__extract_dir_entry(void **out,
+ const void *data,
+ apr_size_t data_len,
+ void *baton,
+ apr_pool_t *pool);
/**
* Describes the change to be done to a directory: Set the entry
@@ -241,65 +241,65 @@ typedef struct replace_baton_t
* identified by its name in the #replace_baton_t in @a baton.
*/
svn_error_t *
-svn_fs_fs__replace_dir_entry(void **data,
- apr_size_t *data_len,
- void *baton,
- apr_pool_t *pool);
+svn_fs_x__replace_dir_entry(void **data,
+ apr_size_t *data_len,
+ void *baton,
+ apr_pool_t *pool);
/**
- * Implements #svn_cache__serialize_func_t for a #svn_fs_fs__rep_header_t.
+ * Implements #svn_cache__serialize_func_t for a #svn_fs_x__rep_header_t.
*/
svn_error_t *
-svn_fs_fs__serialize_rep_header(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool);
+svn_fs_x__serialize_rep_header(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool);
/**
- * Implements #svn_cache__deserialize_func_t for a #svn_fs_fs__rep_header_t.
+ * Implements #svn_cache__deserialize_func_t for a #svn_fs_x__rep_header_t.
*/
svn_error_t *
-svn_fs_fs__deserialize_rep_header(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool);
+svn_fs_x__deserialize_rep_header(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__serialize_func_t for an #apr_array_header_t of
* #change_t *.
*/
svn_error_t *
-svn_fs_fs__serialize_changes(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool);
+svn_fs_x__serialize_changes(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__deserialize_func_t for an #apr_array_header_t of
* #change_t *.
*/
svn_error_t *
-svn_fs_fs__deserialize_changes(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool);
+svn_fs_x__deserialize_changes(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__serialize_func_t for #svn_mergeinfo_t objects.
*/
svn_error_t *
-svn_fs_fs__serialize_mergeinfo(void **data,
- apr_size_t *data_len,
- void *in,
- apr_pool_t *pool);
+svn_fs_x__serialize_mergeinfo(void **data,
+ apr_size_t *data_len,
+ void *in,
+ apr_pool_t *pool);
/**
* Implements #svn_cache__deserialize_func_t for #svn_mergeinfo_t objects.
*/
svn_error_t *
-svn_fs_fs__deserialize_mergeinfo(void **out,
- void *data,
- apr_size_t data_len,
- apr_pool_t *pool);
+svn_fs_x__deserialize_mergeinfo(void **out,
+ void *data,
+ apr_size_t data_len,
+ apr_pool_t *pool);
#endif