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 16:26:25 UTC
svn commit: r1649066 - in /subversion/trunk/subversion/libsvn_fs_x:
changes.c changes.h fs.h low_level.c low_level.h temp_serializer.c
temp_serializer.h transaction.c tree.c
Author: stefan2
Date: Fri Jan 2 15:26:24 2015
New Revision: 1649066
URL: http://svn.apache.org/r1649066
Log:
In FSX, complete the renaming of global structs to meet our coding
guidelines. This is part of a series of search-replace changes.
* subversion/libsvn_fs_x/fs.h
(svn_fs_x__data_t): Update docstring.
(change_t): Rename to ...
(svn_fs_x__change_t): ... this.
* subversion/libsvn_fs_x/changes.c
* subversion/libsvn_fs_x/changes.h
* subversion/libsvn_fs_x/low_level.c
* subversion/libsvn_fs_x/low_level.h
* subversion/libsvn_fs_x/temp_serializer.c
* subversion/libsvn_fs_x/temp_serializer.h
* subversion/libsvn_fs_x/transaction.c
* subversion/libsvn_fs_x/tree.c
(): s/change_t/svn_fs_x__change_t/g
Modified:
subversion/trunk/subversion/libsvn_fs_x/changes.c
subversion/trunk/subversion/libsvn_fs_x/changes.h
subversion/trunk/subversion/libsvn_fs_x/fs.h
subversion/trunk/subversion/libsvn_fs_x/low_level.c
subversion/trunk/subversion/libsvn_fs_x/low_level.h
subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c
subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h
subversion/trunk/subversion/libsvn_fs_x/transaction.c
subversion/trunk/subversion/libsvn_fs_x/tree.c
Modified: subversion/trunk/subversion/libsvn_fs_x/changes.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/changes.c?rev=1649066&r1=1649065&r2=1649066&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/changes.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/changes.c Fri Jan 2 15:26:24 2015
@@ -134,7 +134,7 @@ svn_fs_x__changes_create(apr_size_t init
*/
static svn_error_t *
append_change(svn_fs_x__changes_t *changes,
- change_t *change)
+ svn_fs_x__change_t *change)
{
binary_change_t binary_change = { 0 };
svn_boolean_t is_txn_id;
@@ -193,7 +193,7 @@ svn_fs_x__changes_append_list(apr_size_t
/* simply append the list and all changes */
for (i = 0; i < list->nelts; ++i)
- append_change(changes, APR_ARRAY_IDX(list, i, change_t *));
+ append_change(changes, APR_ARRAY_IDX(list, i, svn_fs_x__change_t *));
/* terminate the list by storing the next changes offset */
APR_ARRAY_PUSH(changes->offsets, int) = changes->changes->nelts;
@@ -245,14 +245,14 @@ svn_fs_x__changes_get_list(apr_array_hea
last = APR_ARRAY_IDX(changes->offsets, (int)idx + 1, int);
/* construct result */
- *list = apr_array_make(pool, last - first, sizeof(change_t*));
+ *list = apr_array_make(pool, last - first, sizeof(svn_fs_x__change_t*));
for (i = first; i < last; ++i)
{
const binary_change_t *binary_change
= &APR_ARRAY_IDX(changes->changes, i, binary_change_t);
- /* convert BINARY_CHANGE into a standard FSX change_t */
- change_t *change = apr_pcalloc(pool, sizeof(*change));
+ /* convert BINARY_CHANGE into a standard FSX svn_fs_x__change_t */
+ svn_fs_x__change_t *change = apr_pcalloc(pool, sizeof(*change));
change->path.data = svn_fs_x__string_table_get(changes->paths,
binary_change->path,
&change->path.len,
@@ -278,7 +278,7 @@ svn_fs_x__changes_get_list(apr_array_hea
pool);
/* add it to the result */
- APR_ARRAY_PUSH(*list, change_t*) = change;
+ APR_ARRAY_PUSH(*list, svn_fs_x__change_t*) = change;
}
return SVN_NO_ERROR;
@@ -495,14 +495,14 @@ svn_fs_x__changes_get_list_func(void **o
last = offsets[idx+1];
/* construct result */
- list = apr_array_make(pool, last - first, sizeof(change_t*));
+ list = apr_array_make(pool, last - first, sizeof(svn_fs_x__change_t*));
for (i = first; i < last; ++i)
{
const binary_change_t *binary_change = &changes[i];
- /* convert BINARY_CHANGE into a standard FSX change_t */
- change_t *change = apr_pcalloc(pool, sizeof(*change));
+ /* convert BINARY_CHANGE into a standard FSX svn_fs_x__change_t */
+ svn_fs_x__change_t *change = apr_pcalloc(pool, sizeof(*change));
change->path.data
= svn_fs_x__string_table_get_func(paths, binary_change->path,
&change->path.len, pool);
@@ -526,7 +526,7 @@ svn_fs_x__changes_get_list_func(void **o
pool);
/* add it to the result */
- APR_ARRAY_PUSH(list, change_t*) = change;
+ APR_ARRAY_PUSH(list, svn_fs_x__change_t*) = change;
}
*out = list;
Modified: subversion/trunk/subversion/libsvn_fs_x/changes.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/changes.h?rev=1649066&r1=1649065&r2=1649066&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/changes.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/changes.h Fri Jan 2 15:26:24 2015
@@ -32,21 +32,21 @@
*
* In its serialized form, the svn_fs_x__changes_t container extracts most
* of that redundancy and the run-time representation is also much smaller
- * than sum of the respective change_t* arrays.
+ * than sum of the respective svn_fs_x__change_t* arrays.
*
* As with other containers, this one has two modes: 'construction', in
* which you may add data to it, and 'getter' in which there is only r/o
* access to the data.
*/
-/* An opaque collection of change lists (apr_array_header_t * of change_t*).
+/* An opaque collection of change lists (apr_array_header_t * of svn_fs_x__change_t*).
*/
typedef struct svn_fs_x__changes_t svn_fs_x__changes_t;
/* Create and populate changes containers. */
/* Create and return a new changes container with an initial capacity of
- * INITIAL_COUNT change_t objects. Allocate the result in POOL.
+ * INITIAL_COUNT svn_fs_x__change_t objects. Allocate the result in POOL.
*/
svn_fs_x__changes_t *
svn_fs_x__changes_create(apr_size_t initial_count,
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1649066&r1=1649065&r2=1649066&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Fri Jan 2 15:26:24 2015
@@ -326,8 +326,8 @@ typedef struct svn_fs_x__data_t
the key is a (pack file revision, file offset) pair */
svn_cache__t *noderevs_container_cache;
- /* Cache for change lists as APR arrays of change_t * objects; the key
- is the revision */
+ /* Cache for change lists as APR arrays of svn_fs_x__change_t * objects;
+ the key is the revision */
svn_cache__t *changes_cache;
/* Cache for change_list_t containers;
@@ -544,7 +544,7 @@ typedef struct svn_fs_x__dirent_t
/*** Change ***/
-typedef struct change_t
+typedef struct svn_fs_x__change_t
{
/* Path of the change. */
svn_string_t path;
@@ -565,7 +565,7 @@ typedef struct change_t
const char *copyfrom_path;
svn_tristate_t mergeinfo_mod;
-} change_t;
+} svn_fs_x__change_t;
#ifdef __cplusplus
Modified: subversion/trunk/subversion/libsvn_fs_x/low_level.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/low_level.c?rev=1649066&r1=1649065&r2=1649066&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/low_level.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/low_level.c Fri Jan 2 15:26:24 2015
@@ -777,14 +777,14 @@ svn_fs_x__write_rep_header(svn_fs_x__rep
the resulting change in *CHANGE_P. If there is no next record,
store NULL there. Perform all allocations from POOL. */
static svn_error_t *
-read_change(change_t **change_p,
+read_change(svn_fs_x__change_t **change_p,
svn_stream_t *stream,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
svn_stringbuf_t *line;
svn_boolean_t eof = TRUE;
- change_t *change;
+ svn_fs_x__change_t *change;
char *str, *last_str, *kind_str;
/* Default return value. */
@@ -959,7 +959,7 @@ svn_fs_x__read_changes(apr_array_header_
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- change_t *change;
+ svn_fs_x__change_t *change;
apr_pool_t *iterpool;
/* Pre-allocate enough room for most change lists.
@@ -970,13 +970,13 @@ svn_fs_x__read_changes(apr_array_header_
respective two-power by just a few bytes (leaves room array and APR
node overhead for large enough M).
*/
- *changes = apr_array_make(result_pool, 63, sizeof(change_t *));
+ *changes = apr_array_make(result_pool, 63, sizeof(svn_fs_x__change_t *));
SVN_ERR(read_change(&change, stream, result_pool, scratch_pool));
iterpool = svn_pool_create(scratch_pool);
while (change)
{
- APR_ARRAY_PUSH(*changes, change_t*) = change;
+ APR_ARRAY_PUSH(*changes, svn_fs_x__change_t*) = change;
SVN_ERR(read_change(&change, stream, result_pool, iterpool));
svn_pool_clear(iterpool);
}
@@ -992,7 +992,7 @@ svn_fs_x__read_changes_incrementally(svn
void *change_receiver_baton,
apr_pool_t *scratch_pool)
{
- change_t *change;
+ svn_fs_x__change_t *change;
apr_pool_t *iterpool;
iterpool = svn_pool_create(scratch_pool);
@@ -1015,7 +1015,7 @@ svn_fs_x__read_changes_incrementally(svn
All temporary allocations are in SCRATCH_POOL. */
static svn_error_t *
write_change_entry(svn_stream_t *stream,
- change_t *change,
+ svn_fs_x__change_t *change,
apr_pool_t *scratch_pool)
{
const char *idstr;
@@ -1106,7 +1106,7 @@ svn_fs_x__write_changes(svn_stream_t *st
/* Write all items to disk in the new order. */
for (i = 0; i < sorted_changed_paths->nelts; ++i)
{
- change_t *change;
+ svn_fs_x__change_t *change;
svn_pool_clear(iterpool);
change = APR_ARRAY_IDX(sorted_changed_paths, i, svn_sort__item_t).value;
Modified: subversion/trunk/subversion/libsvn_fs_x/low_level.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/low_level.h?rev=1649066&r1=1649065&r2=1649066&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/low_level.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/low_level.h Fri Jan 2 15:26:24 2015
@@ -181,7 +181,7 @@ svn_fs_x__read_changes(apr_array_header_
*/
typedef svn_error_t *(*svn_fs_x__change_receiver_t)(
void *baton,
- change_t *change,
+ svn_fs_x__change_t *change,
apr_pool_t *scratch_pool);
/* Read all the changes from STREAM and invoke CHANGE_RECEIVER on each change.
Modified: subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c?rev=1649066&r1=1649065&r2=1649066&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/temp_serializer.c Fri Jan 2 15:26:24 2015
@@ -1024,9 +1024,9 @@ svn_fs_x__deserialize_rep_header(void **
*/
static void
serialize_change(svn_temp_serializer__context_t *context,
- change_t * const *change_p)
+ svn_fs_x__change_t * const *change_p)
{
- const change_t * change = *change_p;
+ const svn_fs_x__change_t * change = *change_p;
if (change == NULL)
return;
@@ -1048,10 +1048,10 @@ serialize_change(svn_temp_serializer__co
*/
static void
deserialize_change(void *buffer,
- change_t **change_p,
+ svn_fs_x__change_t **change_p,
apr_pool_t *pool)
{
- change_t * change;
+ svn_fs_x__change_t * change;
/* fix-up of the pointer to the struct in question */
svn_temp_deserializer__resolve(buffer, (void **)change_p);
@@ -1065,7 +1065,7 @@ deserialize_change(void *buffer,
svn_temp_deserializer__resolve(change, (void **)&change->copyfrom_path);
}
-/* Auxiliary structure representing the content of a change_t array.
+/* Auxiliary structure representing the content of a svn_fs_x__change_t array.
This structure is much easier to (de-)serialize than an APR array.
*/
typedef struct changes_data_t
@@ -1074,7 +1074,7 @@ typedef struct changes_data_t
int count;
/* reference to the changes */
- change_t **changes;
+ svn_fs_x__change_t **changes;
} changes_data_t;
svn_error_t *
@@ -1092,7 +1092,7 @@ svn_fs_x__serialize_changes(void **data,
/* initialize our auxiliary data structure and link it to the
* array elements */
changes.count = array->nelts;
- changes.changes = (change_t **)array->elts;
+ changes.changes = (svn_fs_x__change_t **)array->elts;
/* serialize it and all its elements */
context = svn_temp_serializer__init(&changes,
@@ -1102,7 +1102,7 @@ svn_fs_x__serialize_changes(void **data,
svn_temp_serializer__push(context,
(const void * const *)&changes.changes,
- changes.count * sizeof(change_t*));
+ changes.count * sizeof(svn_fs_x__change_t*));
for (i = 0; i < changes.count; ++i)
serialize_change(context, &changes.changes[i]);
@@ -1126,7 +1126,7 @@ svn_fs_x__deserialize_changes(void **out
{
int i;
changes_data_t *changes = (changes_data_t *)data;
- apr_array_header_t *array = apr_array_make(pool, 0, sizeof(change_t *));
+ apr_array_header_t *array = apr_array_make(pool, 0, sizeof(svn_fs_x__change_t *));
/* de-serialize our auxiliary data structure */
svn_temp_deserializer__resolve(changes, (void**)&changes->changes);
@@ -1134,7 +1134,7 @@ svn_fs_x__deserialize_changes(void **out
/* de-serialize each entry and add it to the array */
for (i = 0; i < changes->count; ++i)
deserialize_change(changes->changes,
- (change_t **)&changes->changes[i],
+ (svn_fs_x__change_t **)&changes->changes[i],
pool);
/* Use the changes buffer as the array's data buffer
Modified: subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h?rev=1649066&r1=1649065&r2=1649066&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/temp_serializer.h Fri Jan 2 15:26:24 2015
@@ -251,7 +251,7 @@ svn_fs_x__deserialize_rep_header(void **
/**
* Implements #svn_cache__serialize_func_t for an #apr_array_header_t of
- * #change_t *.
+ * #svn_fs_x__change_t *.
*/
svn_error_t *
svn_fs_x__serialize_changes(void **data,
@@ -261,7 +261,7 @@ svn_fs_x__serialize_changes(void **data,
/**
* Implements #svn_cache__deserialize_func_t for an #apr_array_header_t of
- * #change_t *.
+ * #svn_fs_x__change_t *.
*/
svn_error_t *
svn_fs_x__deserialize_changes(void **out,
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1649066&r1=1649065&r2=1649066&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Fri Jan 2 15:26:24 2015
@@ -860,11 +860,11 @@ unparse_dir_entries(apr_array_header_t *
/* Return a deep copy of SOURCE and allocate it in RESULT_POOL.
*/
-static change_t *
-path_change_dup(const change_t *source,
+static svn_fs_x__change_t *
+path_change_dup(const svn_fs_x__change_t *source,
apr_pool_t *result_pool)
{
- change_t *result = apr_pmemdup(result_pool, source, sizeof(*source));
+ svn_fs_x__change_t *result = apr_pmemdup(result_pool, source, sizeof(*source));
result->path.data = apr_pstrmemdup(result_pool, source->path.data,
source->path.len);
if (source->copyfrom_path)
@@ -874,17 +874,17 @@ path_change_dup(const change_t *source,
}
/* Merge the internal-use-only CHANGE into a hash of public-FS
- change_t CHANGED_PATHS, collapsing multiple changes into a
+ svn_fs_x__change_t CHANGED_PATHS, collapsing multiple changes into a
single summarical (is that real word?) change per path. DELETIONS is
- also a path->change_t hash and contains all the deletions
+ also a path->svn_fs_x__change_t hash and contains all the deletions
that got turned into a replacement. */
static svn_error_t *
fold_change(apr_hash_t *changed_paths,
apr_hash_t *deletions,
- const change_t *change)
+ const svn_fs_x__change_t *change)
{
apr_pool_t *pool = apr_hash_pool_get(changed_paths);
- change_t *old_change, *new_change;
+ svn_fs_x__change_t *old_change, *new_change;
const svn_string_t *path = &change->path;
if ((old_change = apr_hash_get(changed_paths, path->data, path->len)))
@@ -1026,7 +1026,7 @@ typedef struct process_changes_baton_t
data. Use SCRATCH_POOL for temporary allocations. */
static svn_error_t *
process_changes(void *baton_p,
- change_t *change,
+ svn_fs_x__change_t *change,
apr_pool_t *scratch_pool)
{
process_changes_baton_t *baton = baton_p;
@@ -1764,7 +1764,7 @@ svn_fs_x__add_change(svn_fs_t *fs,
apr_pool_t *pool)
{
apr_file_t *file;
- change_t change;
+ svn_fs_x__change_t change;
apr_hash_t *changes = apr_hash_make(pool);
/* Not using APR_BUFFERED to append change in one atomic write operation. */
@@ -3068,7 +3068,7 @@ verify_locks(svn_fs_t *fs,
{
const svn_sort__item_t *item;
const char *path;
- change_t *change;
+ svn_fs_x__change_t *change;
svn_boolean_t recurse = TRUE;
svn_pool_clear(iterpool);
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1649066&r1=1649065&r2=1649066&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Fri Jan 2 15:26:24 2015
@@ -3226,7 +3226,7 @@ x_get_file_delta_stream(svn_txdelta_stre
static svn_error_t *
construct_fs_path_change(svn_fs_path_change2_t **result_p,
svn_fs_x__id_context_t *context,
- change_t *change,
+ svn_fs_x__change_t *change,
apr_pool_t *result_pool)
{
const svn_fs_id_t *id
@@ -3273,7 +3273,7 @@ x_paths_changed(apr_hash_t **changed_pat
hi;
hi = apr_hash_next(hi))
{
- change_t *change = apr_hash_this_val(hi);
+ svn_fs_x__change_t *change = apr_hash_this_val(hi);
SVN_ERR(construct_fs_path_change(&path_change, context, change,
pool));
apr_hash_set(changed_paths,
@@ -3291,7 +3291,7 @@ x_paths_changed(apr_hash_t **changed_pat
changed_paths = svn_hash__make(pool);
for (i = 0; i < changes->nelts; ++i)
{
- change_t *change = APR_ARRAY_IDX(changes, i, change_t *);
+ svn_fs_x__change_t *change = APR_ARRAY_IDX(changes, i, svn_fs_x__change_t *);
SVN_ERR(construct_fs_path_change(&path_change, context, change,
pool));
apr_hash_set(changed_paths, change->path.data, change->path.len,