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/06 16:41:15 UTC
svn commit: r1649838 - in /subversion/trunk/subversion/libsvn_fs_x: dag.c
dag.h
Author: stefan2
Date: Tue Jan 6 15:41:14 2015
New Revision: 1649838
URL: http://svn.apache.org/r1649838
Log:
Function signatures in FSX should use consistent formatting with the result
type and each parameter on a separate line. Fix this for dag.*
No functional change.
* subversion/libsvn_fs_x/dag.h
(svn_fs_x__dag_get_fs,
svn_fs_x__dag_set_fs,
svn_fs_x__dag_get_revision,
svn_fs_x__dag_get_created_path,
svn_fs_x__dag_get_predecessor_id,
svn_fs_x__dag_get_predecessor_count,
svn_fs_x__dag_get_mergeinfo_count,
svn_fs_x__dag_check_mutable,
svn_fs_x__dag_node_kind,
svn_fs_x__dag_get_proplist,
svn_fs_x__dag_set_proplist,
svn_fs_x__dag_increment_mergeinfo_count,
svn_fs_x__dag_set_has_mergeinfo,
svn_fs_x__dag_revision_root,
svn_fs_x__dag_txn_root,
svn_fs_x__dag_txn_base_root,
svn_fs_x__dag_clone_root,
svn_fs_x__dag_dir_entries,
svn_fs_x__dag_set_entry,
svn_fs_x__dag_clone_child,
svn_fs_x__dag_delete,
svn_fs_x__dag_delete_if_mutable,
svn_fs_x__dag_make_dir,
svn_fs_x__dag_get_contents,
svn_fs_x__dag_get_edit_stream,
svn_fs_x__dag_finalize_edits,
svn_fs_x__dag_file_length,
svn_fs_x__dag_make_file,
svn_fs_x__dag_copy,
svn_fs_x__dag_things_different,
svn_fs_x__dag_get_copyroot,
svn_fs_x__dag_get_copyfrom_rev,
svn_fs_x__dag_get_copyfrom_path): One line per parameter and return types
on a separate line.
* subversion/libsvn_fs_x/dag.c
(svn_fs_x__dag_node_kind,
svn_fs_x__dag_set_fs,
svn_fs_x__dag_check_mutable): Same.
Modified:
subversion/trunk/subversion/libsvn_fs_x/dag.c
subversion/trunk/subversion/libsvn_fs_x/dag.h
Modified: subversion/trunk/subversion/libsvn_fs_x/dag.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.c?rev=1649838&r1=1649837&r2=1649838&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/dag.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/dag.c Tue Jan 6 15:41:14 2015
@@ -81,7 +81,8 @@ struct dag_node_t
/* Trivial helper/accessor functions. */
-svn_node_kind_t svn_fs_x__dag_node_kind(dag_node_t *node)
+svn_node_kind_t
+svn_fs_x__dag_node_kind(dag_node_t *node)
{
return node->kind;
}
@@ -107,7 +108,8 @@ svn_fs_x__dag_get_fs(dag_node_t *node)
}
void
-svn_fs_x__dag_set_fs(dag_node_t *node, svn_fs_t *fs)
+svn_fs_x__dag_set_fs(dag_node_t *node,
+ svn_fs_t *fs)
{
node->fs = fs;
}
@@ -225,7 +227,8 @@ svn_fs_x__dag_same_line_of_history(svn_b
return SVN_NO_ERROR;
}
-svn_boolean_t svn_fs_x__dag_check_mutable(const dag_node_t *node)
+svn_boolean_t
+svn_fs_x__dag_check_mutable(const dag_node_t *node)
{
return svn_fs_x__is_txn(svn_fs_x__dag_get_id(node)->change_set);
}
Modified: subversion/trunk/subversion/libsvn_fs_x/dag.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.h?rev=1649838&r1=1649837&r2=1649838&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/dag.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/dag.h Tue Jan 6 15:41:14 2015
@@ -104,16 +104,20 @@ svn_fs_x__dag_deserialize(void **out,
apr_pool_t *pool);
/* Return the filesystem containing NODE. */
-svn_fs_t *svn_fs_x__dag_get_fs(dag_node_t *node);
+svn_fs_t *
+svn_fs_x__dag_get_fs(dag_node_t *node);
/* Changes the filesystem containing NODE to FS. (Used when pulling
nodes out of a shared cache, say.) */
-void svn_fs_x__dag_set_fs(dag_node_t *node, svn_fs_t *fs);
+void
+svn_fs_x__dag_set_fs(dag_node_t *node,
+ svn_fs_t *fs);
/* Return NODE's revision number. If NODE has never been committed as
part of a revision, set *REV to SVN_INVALID_REVNUM. */
-svn_revnum_t svn_fs_x__dag_get_revision(const dag_node_t *node);
+svn_revnum_t
+svn_fs_x__dag_get_revision(const dag_node_t *node);
/* Return the node revision ID of NODE. The value returned is shared
@@ -148,27 +152,31 @@ svn_fs_x__dag_same_line_of_history(svn_b
/* Return the created path of NODE. The value returned is shared
with NODE, and will be deallocated when NODE is. */
-const char *svn_fs_x__dag_get_created_path(dag_node_t *node);
+const char *
+svn_fs_x__dag_get_created_path(dag_node_t *node);
/* Set *ID_P to the node revision ID of NODE's immediate predecessor.
*/
-svn_error_t *svn_fs_x__dag_get_predecessor_id(svn_fs_x__id_t *id_p,
- dag_node_t *node);
+svn_error_t *
+svn_fs_x__dag_get_predecessor_id(svn_fs_x__id_t *id_p,
+ dag_node_t *node);
/* Set *COUNT to the number of predecessors NODE has (recursively), or
-1 if not known.
*/
/* ### This function is currently only used by 'verify'. */
-svn_error_t *svn_fs_x__dag_get_predecessor_count(int *count,
- dag_node_t *node);
+svn_error_t *
+svn_fs_x__dag_get_predecessor_count(int *count,
+ dag_node_t *node);
/* Set *COUNT to the number of node under NODE (inclusive) with
svn:mergeinfo properties.
*/
-svn_error_t *svn_fs_x__dag_get_mergeinfo_count(apr_int64_t *count,
- dag_node_t *node);
+svn_error_t *
+svn_fs_x__dag_get_mergeinfo_count(apr_int64_t *count,
+ dag_node_t *node);
/* Set *DO_THEY to a flag indicating whether or not NODE is a
directory with at least one descendant (not including itself) with
@@ -186,10 +194,12 @@ svn_fs_x__dag_has_mergeinfo(svn_boolean_
dag_node_t *node);
/* Return non-zero IFF NODE is currently mutable. */
-svn_boolean_t svn_fs_x__dag_check_mutable(const dag_node_t *node);
+svn_boolean_t
+svn_fs_x__dag_check_mutable(const dag_node_t *node);
/* Return the node kind of NODE. */
-svn_node_kind_t svn_fs_x__dag_node_kind(dag_node_t *node);
+svn_node_kind_t
+svn_fs_x__dag_node_kind(dag_node_t *node);
/* Set *PROPLIST_P to a PROPLIST hash representing the entire property
list of NODE, allocating from POOL. The hash has const char *
@@ -201,36 +211,40 @@ svn_node_kind_t svn_fs_x__dag_node_kind(
Use POOL for all allocations.
*/
-svn_error_t *svn_fs_x__dag_get_proplist(apr_hash_t **proplist_p,
- dag_node_t *node,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_get_proplist(apr_hash_t **proplist_p,
+ dag_node_t *node,
+ apr_pool_t *pool);
/* Set the property list of NODE to PROPLIST, allocating from POOL.
The node being changed must be mutable.
Use POOL for all allocations.
*/
-svn_error_t *svn_fs_x__dag_set_proplist(dag_node_t *node,
- apr_hash_t *proplist,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_set_proplist(dag_node_t *node,
+ apr_hash_t *proplist,
+ apr_pool_t *pool);
/* Increment the mergeinfo_count field on NODE by INCREMENT. The node
being changed must be mutable.
Use POOL for all allocations.
*/
-svn_error_t *svn_fs_x__dag_increment_mergeinfo_count(dag_node_t *node,
- apr_int64_t increment,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_increment_mergeinfo_count(dag_node_t *node,
+ apr_int64_t increment,
+ apr_pool_t *pool);
/* Set the has-mergeinfo flag on NODE to HAS_MERGEINFO. The node
being changed must be mutable.
Use POOL for all allocations.
*/
-svn_error_t *svn_fs_x__dag_set_has_mergeinfo(dag_node_t *node,
- svn_boolean_t has_mergeinfo,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_set_has_mergeinfo(dag_node_t *node,
+ svn_boolean_t has_mergeinfo,
+ apr_pool_t *pool);
@@ -239,10 +253,11 @@ svn_error_t *svn_fs_x__dag_set_has_merge
/* Open the root of revision REV of filesystem FS, allocating from
POOL. Set *NODE_P to the new node. */
-svn_error_t *svn_fs_x__dag_revision_root(dag_node_t **node_p,
- svn_fs_t *fs,
- svn_revnum_t rev,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_revision_root(dag_node_t **node_p,
+ svn_fs_t *fs,
+ svn_revnum_t rev,
+ apr_pool_t *pool);
/* Set *NODE_P to the root of transaction TXN_ID in FS, allocating
@@ -252,28 +267,31 @@ svn_error_t *svn_fs_x__dag_revision_root
no changes have been made in the transaction, then it may share its
root directory with its base revision. To get a mutable root node
for a transaction, call svn_fs_x__dag_clone_root. */
-svn_error_t *svn_fs_x__dag_txn_root(dag_node_t **node_p,
- svn_fs_t *fs,
- svn_fs_x__txn_id_t txn_id,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_txn_root(dag_node_t **node_p,
+ svn_fs_t *fs,
+ svn_fs_x__txn_id_t txn_id,
+ apr_pool_t *pool);
/* Set *NODE_P to the base root of transaction TXN_ID in FS,
allocating from POOL. Allocate the node in TRAIL->pool. */
-svn_error_t *svn_fs_x__dag_txn_base_root(dag_node_t **node_p,
- svn_fs_t *fs,
- svn_fs_x__txn_id_t txn_id,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_txn_base_root(dag_node_t **node_p,
+ svn_fs_t *fs,
+ svn_fs_x__txn_id_t txn_id,
+ apr_pool_t *pool);
/* Clone the root directory of TXN_ID in FS, and update the
`transactions' table entry to point to it, unless this has been
done already. In either case, set *ROOT_P to a reference to the
root directory clone. Allocate *ROOT_P in POOL. */
-svn_error_t *svn_fs_x__dag_clone_root(dag_node_t **root_p,
- svn_fs_t *fs,
- svn_fs_x__txn_id_t txn_id,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_clone_root(dag_node_t **root_p,
+ svn_fs_t *fs,
+ svn_fs_x__txn_id_t txn_id,
+ apr_pool_t *pool);
@@ -296,9 +314,10 @@ svn_fs_x__dag_open(dag_node_t **child_p,
/* Set *ENTRIES_P to an array of NODE's entries, sorted by entry names,
and the values are svn_fs_x__dirent_t. The returned table (and elements)
is allocated in POOL, which is also used for temporary allocations. */
-svn_error_t *svn_fs_x__dag_dir_entries(apr_array_header_t **entries_p,
- dag_node_t *node,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_dir_entries(apr_array_header_t **entries_p,
+ dag_node_t *node,
+ apr_pool_t *pool);
/* Fetches the NODE's entries and returns a copy of the entry selected
by the key value given in NAME and set *DIRENT to a copy of that
@@ -322,12 +341,13 @@ svn_error_t * svn_fs_x__dag_dir_entry(sv
Use POOL for all allocations, including to cache the node_revision in
NODE.
*/
-svn_error_t *svn_fs_x__dag_set_entry(dag_node_t *node,
- const char *entry_name,
- const svn_fs_x__id_t *id,
- svn_node_kind_t kind,
- svn_fs_x__txn_id_t txn_id,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_set_entry(dag_node_t *node,
+ const char *entry_name,
+ const svn_fs_x__id_t *id,
+ svn_node_kind_t kind,
+ svn_fs_x__txn_id_t txn_id,
+ apr_pool_t *pool);
/* Make a new mutable clone of the node named NAME in PARENT, and
@@ -349,14 +369,15 @@ svn_error_t *svn_fs_x__dag_set_entry(dag
Use POOL for all allocations.
*/
-svn_error_t *svn_fs_x__dag_clone_child(dag_node_t **child_p,
- dag_node_t *parent,
- const char *parent_path,
- const char *name,
- const svn_fs_x__id_t *copy_id,
- svn_fs_x__txn_id_t txn_id,
- svn_boolean_t is_parent_copyroot,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_clone_child(dag_node_t **child_p,
+ dag_node_t *parent,
+ const char *parent_path,
+ const char *name,
+ const svn_fs_x__id_t *copy_id,
+ svn_fs_x__txn_id_t txn_id,
+ svn_boolean_t is_parent_copyroot,
+ apr_pool_t *pool);
/* Delete the directory entry named NAME from PARENT, allocating from
@@ -371,10 +392,11 @@ svn_error_t *svn_fs_x__dag_clone_child(d
Use POOL for all allocations.
*/
-svn_error_t *svn_fs_x__dag_delete(dag_node_t *parent,
- const char *name,
- svn_fs_x__txn_id_t txn_id,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_delete(dag_node_t *parent,
+ const char *name,
+ svn_fs_x__txn_id_t txn_id,
+ apr_pool_t *pool);
/* Delete all mutable node revisions reachable from node ID, including
@@ -382,9 +404,10 @@ svn_error_t *svn_fs_x__dag_delete(dag_no
delete any mutable representations and strings associated with that
node revision. ID may refer to a file or directory, which may be
mutable or immutable. */
-svn_error_t *svn_fs_x__dag_delete_if_mutable(svn_fs_t *fs,
- const svn_fs_x__id_t *id,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_delete_if_mutable(svn_fs_t *fs,
+ const svn_fs_x__id_t *id,
+ apr_pool_t *pool);
/* Create a new mutable directory named NAME in PARENT. Set *CHILD_P
@@ -398,12 +421,13 @@ svn_error_t *svn_fs_x__dag_delete_if_mut
Use POOL for all allocations.
*/
-svn_error_t *svn_fs_x__dag_make_dir(dag_node_t **child_p,
- dag_node_t *parent,
- const char *parent_path,
- const char *name,
- svn_fs_x__txn_id_t txn_id,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_make_dir(dag_node_t **child_p,
+ dag_node_t *parent,
+ const char *parent_path,
+ const char *name,
+ svn_fs_x__txn_id_t txn_id,
+ apr_pool_t *pool);
@@ -417,9 +441,10 @@ svn_error_t *svn_fs_x__dag_make_dir(dag_
Use POOL for all allocations.
*/
-svn_error_t *svn_fs_x__dag_get_contents(svn_stream_t **contents,
- dag_node_t *file,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_get_contents(svn_stream_t **contents,
+ dag_node_t *file,
+ apr_pool_t *pool);
/* Attempt to fetch the contents of NODE and pass it along with the BATON
to the PROCESSOR. Set *SUCCESS only of the data could be provided
@@ -455,9 +480,10 @@ svn_fs_x__dag_get_file_delta_stream(svn_
Use POOL for all allocations.
*/
-svn_error_t *svn_fs_x__dag_get_edit_stream(svn_stream_t **contents,
- dag_node_t *file,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_get_edit_stream(svn_stream_t **contents,
+ dag_node_t *file,
+ apr_pool_t *pool);
/* Signify the completion of edits to FILE made using the stream
@@ -472,18 +498,20 @@ svn_error_t *svn_fs_x__dag_get_edit_stre
Use POOL for all allocations, including to cache the node_revision in
FILE.
*/
-svn_error_t *svn_fs_x__dag_finalize_edits(dag_node_t *file,
- const svn_checksum_t *checksum,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_finalize_edits(dag_node_t *file,
+ const svn_checksum_t *checksum,
+ apr_pool_t *pool);
/* Set *LENGTH to the length of the contents of FILE.
Use POOL for all allocations.
*/
-svn_error_t *svn_fs_x__dag_file_length(svn_filesize_t *length,
- dag_node_t *file,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_file_length(svn_filesize_t *length,
+ dag_node_t *file,
+ apr_pool_t *pool);
/* Put the recorded checksum of type KIND for FILE into CHECKSUM, allocating
from POOL.
@@ -509,12 +537,13 @@ svn_fs_x__dag_file_checksum(svn_checksum
Use POOL for all allocations.
*/
-svn_error_t *svn_fs_x__dag_make_file(dag_node_t **child_p,
- dag_node_t *parent,
- const char *parent_path,
- const char *name,
- svn_fs_x__txn_id_t txn_id,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_make_file(dag_node_t **child_p,
+ dag_node_t *parent,
+ const char *parent_path,
+ const char *name,
+ svn_fs_x__txn_id_t txn_id,
+ apr_pool_t *pool);
@@ -534,14 +563,15 @@ svn_error_t *svn_fs_x__dag_make_file(dag
Use POOL for all allocations.
*/
-svn_error_t *svn_fs_x__dag_copy(dag_node_t *to_node,
- const char *entry,
- dag_node_t *from_node,
- svn_boolean_t preserve_history,
- svn_revnum_t from_rev,
- const char *from_path,
- svn_fs_x__txn_id_t txn_id,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_copy(dag_node_t *to_node,
+ const char *entry,
+ dag_node_t *from_node,
+ svn_boolean_t preserve_history,
+ svn_revnum_t from_rev,
+ const char *from_path,
+ svn_fs_x__txn_id_t txn_id,
+ apr_pool_t *pool);
/* Comparison */
@@ -559,30 +589,34 @@ svn_error_t *svn_fs_x__dag_copy(dag_node
Use POOL for temporary allocations.
*/
-svn_error_t *svn_fs_x__dag_things_different(svn_boolean_t *props_changed,
- svn_boolean_t *contents_changed,
- dag_node_t *node1,
- dag_node_t *node2,
- svn_boolean_t strict,
- apr_pool_t *pool);
+svn_error_t *
+svn_fs_x__dag_things_different(svn_boolean_t *props_changed,
+ svn_boolean_t *contents_changed,
+ dag_node_t *node1,
+ dag_node_t *node2,
+ svn_boolean_t strict,
+ apr_pool_t *pool);
/* Set *REV and *PATH to the copyroot revision and path of node NODE, or
to SVN_INVALID_REVNUM and NULL if no copyroot exists.
*/
-svn_error_t *svn_fs_x__dag_get_copyroot(svn_revnum_t *rev,
- const char **path,
- dag_node_t *node);
+svn_error_t *
+svn_fs_x__dag_get_copyroot(svn_revnum_t *rev,
+ const char **path,
+ dag_node_t *node);
/* Set *REV to the copyfrom revision associated with NODE.
*/
-svn_error_t *svn_fs_x__dag_get_copyfrom_rev(svn_revnum_t *rev,
- dag_node_t *node);
+svn_error_t *
+svn_fs_x__dag_get_copyfrom_rev(svn_revnum_t *rev,
+ dag_node_t *node);
/* Set *PATH to the copyfrom path associated with NODE.
*/
-svn_error_t *svn_fs_x__dag_get_copyfrom_path(const char **path,
- dag_node_t *node);
+svn_error_t *
+svn_fs_x__dag_get_copyfrom_path(const char **path,
+ dag_node_t *node);
/* Update *TARGET so that SOURCE is it's predecessor.
*/