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/09 16:51:37 UTC
svn commit: r1650580 - in /subversion/trunk/subversion/libsvn_fs_x: fs.c
hotcopy.h id.h lock.h recovery.h tree.c tree.h verify.h
Author: stefan2
Date: Fri Jan 9 15:51:37 2015
New Revision: 1650580
URL: http://svn.apache.org/r1650580
Log:
Function signatures in FSX should use consistent formatting with the result
type and each parameter on a separate line.
Apply this rule to the remainder of FSX. No functional change.
* subversion/libsvn_fs_x/fs.c
* subversion/libsvn_fs_x/hotcopy.h
* subversion/libsvn_fs_x/id.h
* subversion/libsvn_fs_x/lock.h
* subversion/libsvn_fs_x/recovery.h
* subversion/libsvn_fs_x/tree.c
* subversion/libsvn_fs_x/tree.h
* subversion/libsvn_fs_x/verify.h
(): Fix function signature formatting.
Modified:
subversion/trunk/subversion/libsvn_fs_x/fs.c
subversion/trunk/subversion/libsvn_fs_x/hotcopy.h
subversion/trunk/subversion/libsvn_fs_x/id.h
subversion/trunk/subversion/libsvn_fs_x/lock.h
subversion/trunk/subversion/libsvn_fs_x/recovery.h
subversion/trunk/subversion/libsvn_fs_x/tree.c
subversion/trunk/subversion/libsvn_fs_x/tree.h
subversion/trunk/subversion/libsvn_fs_x/verify.h
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.c?rev=1650580&r1=1650579&r2=1650580&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.c Fri Jan 9 15:51:37 2015
@@ -428,7 +428,8 @@ x_upgrade(svn_fs_t *fs,
}
static svn_error_t *
-x_verify(svn_fs_t *fs, const char *path,
+x_verify(svn_fs_t *fs,
+ const char *path,
svn_revnum_t start,
svn_revnum_t end,
svn_fs_progress_notify_func_t notify_func,
@@ -597,7 +598,8 @@ static fs_library_vtable_t library_vtabl
svn_error_t *
svn_fs_x__init(const svn_version_t *loader_version,
- fs_library_vtable_t **vtable, apr_pool_t* common_pool)
+ fs_library_vtable_t **vtable,
+ apr_pool_t* common_pool)
{
static const svn_version_checklist_t checklist[] =
{
Modified: subversion/trunk/subversion/libsvn_fs_x/hotcopy.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/hotcopy.h?rev=1650580&r1=1650579&r2=1650580&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/hotcopy.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/hotcopy.h Fri Jan 9 15:51:37 2015
@@ -39,13 +39,14 @@ svn_fs_x__hotcopy_prepare_target(svn_fs_
* not re-copy data which already exists in DST_FS. Indicate progress via
* the optional NOTIFY_FUNC callback using NOTIFY_BATON. Use POOL for
* temporary allocations. */
-svn_error_t * svn_fs_x__hotcopy(svn_fs_t *src_fs,
- svn_fs_t *dst_fs,
- svn_boolean_t incremental,
- svn_fs_hotcopy_notify_t notify_func,
- void *notify_baton,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__hotcopy(svn_fs_t *src_fs,
+ svn_fs_t *dst_fs,
+ svn_boolean_t incremental,
+ svn_fs_hotcopy_notify_t notify_func,
+ void *notify_baton,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool);
#endif
Modified: subversion/trunk/subversion/libsvn_fs_x/id.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/id.h?rev=1650580&r1=1650579&r2=1650580&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/id.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/id.h Fri Jan 9 15:51:37 2015
@@ -45,25 +45,31 @@ typedef apr_int64_t svn_fs_x__change_set
/* Return TRUE iff the CHANGE_SET refers to a revision
(will return FALSE for SVN_INVALID_REVNUM). */
-svn_boolean_t svn_fs_x__is_revision(svn_fs_x__change_set_t change_set);
+svn_boolean_t
+svn_fs_x__is_revision(svn_fs_x__change_set_t change_set);
/* Return TRUE iff the CHANGE_SET refers to a transaction
(will return FALSE for SVN_FS_X__INVALID_TXN_ID). */
-svn_boolean_t svn_fs_x__is_txn(svn_fs_x__change_set_t change_set);
+svn_boolean_t
+svn_fs_x__is_txn(svn_fs_x__change_set_t change_set);
/* Return the revision number that corresponds to CHANGE_SET.
Will SVN_INVALID_REVNUM for transactions. */
-svn_revnum_t svn_fs_x__get_revnum(svn_fs_x__change_set_t change_set);
+svn_revnum_t
+svn_fs_x__get_revnum(svn_fs_x__change_set_t change_set);
/* Return the transaction ID that corresponds to CHANGE_SET.
Will SVN_FS_X__INVALID_TXN_ID for revisions. */
-svn_fs_x__txn_id_t svn_fs_x__get_txn_id(svn_fs_x__change_set_t change_set);
+svn_fs_x__txn_id_t
+svn_fs_x__get_txn_id(svn_fs_x__change_set_t change_set);
/* Convert REVNUM into a change set number */
-svn_fs_x__change_set_t svn_fs_x__change_set_by_rev(svn_revnum_t revnum);
+svn_fs_x__change_set_t
+svn_fs_x__change_set_by_rev(svn_revnum_t revnum);
/* Convert TXN_ID into a change set number */
-svn_fs_x__change_set_t svn_fs_x__change_set_by_txn(svn_fs_x__txn_id_t txn_id);
+svn_fs_x__change_set_t
+svn_fs_x__change_set_by_txn(svn_fs_x__txn_id_t txn_id);
/* An ID in FSX consists of a creation CHANGE_SET number and some changeset-
* local counter value (NUMBER).
@@ -80,11 +86,13 @@ typedef struct svn_fs_x__id_t
/* Return TRUE, if both elements of the PART is 0, i.e. this is the default
* value if e.g. no copies were made of this node. */
-svn_boolean_t svn_fs_x__id_is_root(const svn_fs_x__id_t *part);
+svn_boolean_t
+svn_fs_x__id_is_root(const svn_fs_x__id_t *part);
/* Return TRUE, if all element values of *LHS and *RHS match. */
-svn_boolean_t svn_fs_x__id_eq(const svn_fs_x__id_t *lhs,
- const svn_fs_x__id_t *rhs);
+svn_boolean_t
+svn_fs_x__id_eq(const svn_fs_x__id_t *lhs,
+ const svn_fs_x__id_t *rhs);
/* Parse the NUL-terminated ID part at DATA and write the result into *PART.
*/
@@ -98,14 +106,17 @@ svn_fs_x__id_unparse(const svn_fs_x__id_
apr_pool_t *pool);
/* Set *PART to "unused". */
-void svn_fs_x__id_reset(svn_fs_x__id_t *part);
+void
+svn_fs_x__id_reset(svn_fs_x__id_t *part);
/* Return TRUE if *PART is belongs to either a revision or transaction. */
-svn_boolean_t svn_fs_x__id_used(const svn_fs_x__id_t *part);
+svn_boolean_t
+svn_fs_x__id_used(const svn_fs_x__id_t *part);
/* Return 0 if A and B are equal, 1 if A is "greater than" B, -1 otherwise. */
-int svn_fs_x__id_compare(const svn_fs_x__id_t *a,
- const svn_fs_x__id_t *b);
+int
+svn_fs_x__id_compare(const svn_fs_x__id_t *a,
+ const svn_fs_x__id_t *b);
/* Set *NODEREV_ID to the root node ID of transaction TXN_ID. */
void
Modified: subversion/trunk/subversion/libsvn_fs_x/lock.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/lock.h?rev=1650580&r1=1650579&r2=1650580&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/lock.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/lock.h Fri Jan 9 15:51:37 2015
@@ -33,44 +33,49 @@ extern "C" {
library's fs vtables. */
/* See svn_fs_lock(), svn_fs_lock_many(). */
-svn_error_t *svn_fs_x__lock(svn_fs_t *fs,
- apr_hash_t *targets,
- const char *comment,
- svn_boolean_t is_dav_comment,
- apr_time_t expiration_date,
- svn_boolean_t steal_lock,
- svn_fs_lock_callback_t lock_callback,
- void *lock_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+svn_error_t *
+svn_fs_x__lock(svn_fs_t *fs,
+ apr_hash_t *targets,
+ const char *comment,
+ svn_boolean_t is_dav_comment,
+ apr_time_t expiration_date,
+ svn_boolean_t steal_lock,
+ svn_fs_lock_callback_t lock_callback,
+ void *lock_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
/* See svn_fs_generate_lock_token(). */
-svn_error_t *svn_fs_x__generate_lock_token(const char **token,
- svn_fs_t *fs,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__generate_lock_token(const char **token,
+ svn_fs_t *fs,
+ apr_pool_t *pool);
/* See svn_fs_unlock(), svn_fs_unlock_many(). */
-svn_error_t *svn_fs_x__unlock(svn_fs_t *fs,
- apr_hash_t *targets,
- svn_boolean_t break_lock,
- svn_fs_lock_callback_t lock_callback,
- void *lock_baton,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+svn_error_t *
+svn_fs_x__unlock(svn_fs_t *fs,
+ apr_hash_t *targets,
+ svn_boolean_t break_lock,
+ svn_fs_lock_callback_t lock_callback,
+ void *lock_baton,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
/* See svn_fs_get_lock(). */
-svn_error_t *svn_fs_x__get_lock(svn_lock_t **lock,
- svn_fs_t *fs,
- const char *path,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__get_lock(svn_lock_t **lock,
+ svn_fs_t *fs,
+ const char *path,
+ apr_pool_t *pool);
/* See svn_fs_get_locks2(). */
-svn_error_t *svn_fs_x__get_locks(svn_fs_t *fs,
- const char *path,
- svn_depth_t depth,
- svn_fs_get_locks_callback_t get_locks_func,
- void *get_locks_baton,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__get_locks(svn_fs_t *fs,
+ const char *path,
+ svn_depth_t depth,
+ svn_fs_get_locks_callback_t get_locks_func,
+ void *get_locks_baton,
+ apr_pool_t *pool);
/* Examine PATH for existing locks, and check whether they can be
@@ -97,11 +102,12 @@ svn_error_t *svn_fs_x__get_locks(svn_fs_
If the caller (directly or indirectly) has the FS write lock,
HAVE_WRITE_LOCK should be true.
*/
-svn_error_t *svn_fs_x__allow_locked_operation(const char *path,
- svn_fs_t *fs,
- svn_boolean_t recurse,
- svn_boolean_t have_write_lock,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__allow_locked_operation(const char *path,
+ svn_fs_t *fs,
+ svn_boolean_t recurse,
+ svn_boolean_t have_write_lock,
+ apr_pool_t *pool);
#ifdef __cplusplus
}
Modified: subversion/trunk/subversion/libsvn_fs_x/recovery.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/recovery.h?rev=1650580&r1=1650579&r2=1650580&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/recovery.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/recovery.h Fri Jan 9 15:51:37 2015
@@ -28,9 +28,10 @@
/* Recover the fsx associated with filesystem FS.
Use optional CANCEL_FUNC/CANCEL_BATON for cancellation support.
Use POOL for temporary allocations. */
-svn_error_t *svn_fs_x__recover(svn_fs_t *fs,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__recover(svn_fs_t *fs,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool);
#endif
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1650580&r1=1650579&r2=1650580&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Fri Jan 9 15:51:37 2015
@@ -97,27 +97,32 @@ typedef struct fs_txn_root_data_t
} fs_txn_root_data_t;
/* Declared here to resolve the circular dependencies. */
-static svn_error_t * get_dag(dag_node_t **dag_node_p,
- svn_fs_root_t *root,
- const char *path,
- apr_pool_t *pool);
-
-static svn_fs_root_t *make_revision_root(svn_fs_t *fs, svn_revnum_t rev,
- dag_node_t *root_dir,
- apr_pool_t *pool);
-
-static svn_error_t *make_txn_root(svn_fs_root_t **root_p,
- svn_fs_t *fs,
- svn_fs_x__txn_id_t txn_id,
- svn_revnum_t base_rev,
- apr_uint32_t flags,
- apr_pool_t *pool);
-
-static svn_error_t *x_closest_copy(svn_fs_root_t **root_p,
- const char **path_p,
- svn_fs_root_t *root,
- const char *path,
- apr_pool_t *pool);
+static svn_error_t *
+get_dag(dag_node_t **dag_node_p,
+ svn_fs_root_t *root,
+ const char *path,
+ apr_pool_t *pool);
+
+static svn_fs_root_t *
+make_revision_root(svn_fs_t *fs,
+ svn_revnum_t rev,
+ dag_node_t *root_dir,
+ apr_pool_t *pool);
+
+static svn_error_t *
+make_txn_root(svn_fs_root_t **root_p,
+ svn_fs_t *fs,
+ svn_fs_x__txn_id_t txn_id,
+ svn_revnum_t base_rev,
+ apr_uint32_t flags,
+ apr_pool_t *pool);
+
+static svn_error_t *
+x_closest_copy(svn_fs_root_t **root_p,
+ const char **path_p,
+ svn_fs_root_t *root,
+ const char *path,
+ apr_pool_t *pool);
/*** Node Caching ***/
@@ -3402,12 +3407,12 @@ find_youngest_copyroot(svn_revnum_t *rev
}
-static
-svn_error_t *x_closest_copy(svn_fs_root_t **root_p,
- const char **path_p,
- svn_fs_root_t *root,
- const char *path,
- apr_pool_t *pool)
+static svn_error_t *
+x_closest_copy(svn_fs_root_t **root_p,
+ const char **path_p,
+ svn_fs_root_t *root,
+ const char *path,
+ apr_pool_t *pool)
{
svn_fs_t *fs = root->fs;
parent_path_t *parent_path, *copy_dst_parent_path;
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.h?rev=1650580&r1=1650579&r2=1650580&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.h Fri Jan 9 15:51:37 2015
@@ -38,25 +38,34 @@ svn_fs_x__create_dag_cache(apr_pool_t *p
/* Set *ROOT_P to the root directory of revision REV in filesystem FS.
Allocate the structure in POOL. */
-svn_error_t *svn_fs_x__revision_root(svn_fs_root_t **root_p, svn_fs_t *fs,
- svn_revnum_t rev, apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__revision_root(svn_fs_root_t **root_p,
+ svn_fs_t *fs,
+ svn_revnum_t rev,
+ apr_pool_t *pool);
/* Does nothing, but included for Subversion 1.0.x compatibility. */
-svn_error_t *svn_fs_x__deltify(svn_fs_t *fs, svn_revnum_t rev,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__deltify(svn_fs_t *fs,
+ svn_revnum_t rev,
+ apr_pool_t *pool);
/* Commit the transaction TXN as a new revision. Return the new
revision in *NEW_REV. If the transaction conflicts with other
changes return SVN_ERR_FS_CONFLICT and set *CONFLICT_P to a string
that details the cause of the conflict. */
-svn_error_t *svn_fs_x__commit_txn(const char **conflict_p,
- svn_revnum_t *new_rev, svn_fs_txn_t *txn,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__commit_txn(const char **conflict_p,
+ svn_revnum_t *new_rev,
+ svn_fs_txn_t *txn,
+ apr_pool_t *pool);
/* Set ROOT_P to the root directory of transaction TXN. Allocate the
structure in POOL. */
-svn_error_t *svn_fs_x__txn_root(svn_fs_root_t **root_p, svn_fs_txn_t *txn,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__txn_root(svn_fs_root_t **root_p,
+ svn_fs_txn_t *txn,
+ apr_pool_t *pool);
/* Set KIND_P to the node kind of the node at PATH in ROOT.
Modified: subversion/trunk/subversion/libsvn_fs_x/verify.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/verify.h?rev=1650580&r1=1650579&r2=1650580&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/verify.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/verify.h Fri Jan 9 15:51:37 2015
@@ -30,13 +30,14 @@
* NOTIFY_FUNC callback using NOTIFY_BATON. The optional CANCEL_FUNC
* will periodically be called with CANCEL_BATON to allow for preemption.
* Use POOL for temporary allocations. */
-svn_error_t *svn_fs_x__verify(svn_fs_t *fs,
- svn_revnum_t start,
- svn_revnum_t end,
- svn_fs_progress_notify_func_t notify_func,
- void *notify_baton,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__verify(svn_fs_t *fs,
+ svn_revnum_t start,
+ svn_revnum_t end,
+ svn_fs_progress_notify_func_t notify_func,
+ void *notify_baton,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool);
#endif