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 2014/12/27 18:20:45 UTC
svn commit: r1648070 - in
/subversion/branches/fsx-id/subversion/libsvn_fs_x: id.c id.h
Author: stefan2
Date: Sat Dec 27 17:20:45 2014
New Revision: 1648070
URL: http://svn.apache.org/r1648070
Log:
On the fsx-id branch: Remove a few unused ID functions and remove
a couple more from the header.
* subversion/libsvn_fs_x/id.h
(svn_fs_x__id_part_compare): Move up.
(svn_fs_x__id_txn_id,
svn_fs_x__id_rev,
svn_fs_x__id_item,
svn_fs_x__id_check_related,
svn_fs_x__id_compare,
svn_fs_x__id_txn_create_root,
svn_fs_x__id_create_root,
svn_fs_x__id_txn_create): Remove from header.
* subversion/libsvn_fs_x/id.c
(svn_fs_x__id_txn_id,
svn_fs_x__id_rev,
svn_fs_x__id_item): Remove.
(svn_fs_x__id_check_related: Rename to ...
(id_check_related): ... this.
(svn_fs_x__id_compare): Rename to ...
(id_compare): ... this. Update caller.
(id_vtable): Update function reference.
(svn_fs_x__id_txn_create_root,
svn_fs_x__id_create_root,
svn_fs_x__id_txn_create): Remove.
Modified:
subversion/branches/fsx-id/subversion/libsvn_fs_x/id.c
subversion/branches/fsx-id/subversion/libsvn_fs_x/id.h
Modified: subversion/branches/fsx-id/subversion/libsvn_fs_x/id.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-id/subversion/libsvn_fs_x/id.c?rev=1648070&r1=1648069&r2=1648070&view=diff
==============================================================================
--- subversion/branches/fsx-id/subversion/libsvn_fs_x/id.c (original)
+++ subversion/branches/fsx-id/subversion/libsvn_fs_x/id.c Sat Dec 27 17:20:45 2014
@@ -214,15 +214,6 @@ svn_fs_x__id_node_id(const svn_fs_id_t *
}
-svn_fs_x__txn_id_t
-svn_fs_x__id_txn_id(const svn_fs_id_t *fs_id)
-{
- const fs_x__id_t *id = (const fs_x__id_t *)fs_id;
-
- return svn_fs_x__get_txn_id(id->noderev_id.change_set);
-}
-
-
const svn_fs_x__noderev_id_t *
svn_fs_x__id_noderev_id(const svn_fs_id_t* fs_id)
{
@@ -231,23 +222,6 @@ svn_fs_x__id_noderev_id(const svn_fs_id_
return &id->noderev_id;
}
-svn_revnum_t
-svn_fs_x__id_rev(const svn_fs_id_t *fs_id)
-{
- const fs_x__id_t *id = (const fs_x__id_t *)fs_id;
-
- return svn_fs_x__get_revnum(id->noderev_id.change_set);
-}
-
-
-apr_uint64_t
-svn_fs_x__id_item(const svn_fs_id_t *fs_id)
-{
- const fs_x__id_t *id = (const fs_x__id_t *)fs_id;
-
- return id->noderev_id.number;
-}
-
svn_boolean_t
svn_fs_x__id_is_txn(const svn_fs_id_t *fs_id)
{
@@ -284,9 +258,9 @@ svn_fs_x__id_eq(const svn_fs_id_t *a,
}
-svn_boolean_t
-svn_fs_x__id_check_related(const svn_fs_id_t *a,
- const svn_fs_id_t *b)
+static svn_boolean_t
+id_check_related(const svn_fs_id_t *a,
+ const svn_fs_id_t *b)
{
const fs_x__id_t *id_a = (const fs_x__id_t *)a;
const fs_x__id_t *id_b = (const fs_x__id_t *)b;
@@ -305,14 +279,14 @@ svn_fs_x__id_check_related(const svn_fs_
}
-svn_fs_node_relation_t
-svn_fs_x__id_compare(const svn_fs_id_t *a,
- const svn_fs_id_t *b)
+static svn_fs_node_relation_t
+id_compare(const svn_fs_id_t *a,
+ const svn_fs_id_t *b)
{
if (svn_fs_x__id_eq(a, b))
return svn_fs_node_same;
- return (svn_fs_x__id_check_related(a, b) ? svn_fs_node_common_ancestor
- : svn_fs_node_unrelated);
+ return (id_check_related(a, b) ? svn_fs_node_common_ancestor
+ : svn_fs_node_unrelated);
}
int
@@ -333,63 +307,10 @@ svn_fs_x__id_part_compare(const svn_fs_x
static id_vtable_t id_vtable = {
svn_fs_x__id_unparse,
- svn_fs_x__id_compare
+ id_compare
};
svn_fs_id_t *
-svn_fs_x__id_txn_create_root(svn_fs_x__txn_id_t txn_id,
- apr_pool_t *pool)
-{
- fs_x__id_t *id = apr_pcalloc(pool, sizeof(*id));
-
- /* node ID and copy ID are "0" */
-
- id->noderev_id.change_set = svn_fs_x__change_set_by_txn(txn_id);
- id->noderev_id.number = SVN_FS_X__ITEM_INDEX_ROOT_NODE;
-
- id->generic_id.vtable = &id_vtable;
- id->generic_id.fsap_data = id;
-
- return (svn_fs_id_t *)id;
-}
-
-svn_fs_id_t *svn_fs_x__id_create_root(const svn_revnum_t revision,
- apr_pool_t *pool)
-{
- fs_x__id_t *id = apr_pcalloc(pool, sizeof(*id));
-
- /* node ID and copy ID are "0" */
-
- id->noderev_id.change_set = svn_fs_x__change_set_by_rev(revision);
- id->noderev_id.number = SVN_FS_X__ITEM_INDEX_ROOT_NODE;
-
- id->generic_id.vtable = &id_vtable;
- id->generic_id.fsap_data = id;
-
- return (svn_fs_id_t *)id;
-}
-
-svn_fs_id_t *
-svn_fs_x__id_txn_create(const svn_fs_x__id_part_t *node_id,
- svn_fs_x__txn_id_t txn_id,
- apr_uint64_t item,
- apr_pool_t *pool)
-{
- fs_x__id_t *id = apr_pcalloc(pool, sizeof(*id));
-
- id->node_id = *node_id;
-
- id->noderev_id.change_set = svn_fs_x__change_set_by_txn(txn_id);
- id->noderev_id.number = item;
-
- id->generic_id.vtable = &id_vtable;
- id->generic_id.fsap_data = id;
-
- return (svn_fs_id_t *)id;
-}
-
-
-svn_fs_id_t *
svn_fs_x__id_create(const svn_fs_x__id_part_t *node_id,
const svn_fs_x__id_part_t *noderev_id,
apr_pool_t *pool)
Modified: subversion/branches/fsx-id/subversion/libsvn_fs_x/id.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-id/subversion/libsvn_fs_x/id.h?rev=1648070&r1=1648069&r2=1648070&view=diff
==============================================================================
--- subversion/branches/fsx-id/subversion/libsvn_fs_x/id.h (original)
+++ subversion/branches/fsx-id/subversion/libsvn_fs_x/id.h Sat Dec 27 17:20:45 2014
@@ -107,6 +107,10 @@ void svn_fs_x__id_part_reset(svn_fs_x__i
/* Return TRUE if *PART is belongs to either a revision or transaction. */
svn_boolean_t svn_fs_x__id_part_used(const svn_fs_x__id_part_t *part);
+/* Return 0 if A and B are equal, 1 if A is "greater than" B, -1 otherwise. */
+int svn_fs_x__id_part_compare(const svn_fs_x__id_part_t *a,
+ const svn_fs_x__id_part_t *b);
+
/* Set *NODEREV_ID to the root node ID of transaction TXN_ID. */
void
svn_fs_x__init_txn_root(svn_fs_x__noderev_id_t *noderev_id,
@@ -123,21 +127,9 @@ svn_fs_x__init_rev_root(svn_fs_x__nodere
/* Get the "node id" portion of ID. */
const svn_fs_x__id_part_t *svn_fs_x__id_node_id(const svn_fs_id_t *id);
-/* Get the "txn id" portion of ID,
- * or SVN_FS_X__INVALID_TXN_ID if it is a permanent ID. */
-svn_fs_x__txn_id_t svn_fs_x__id_txn_id(const svn_fs_id_t *id);
-
/* Get the "noderev id" portion of ID. */
const svn_fs_x__noderev_id_t *svn_fs_x__id_noderev_id(const svn_fs_id_t *id);
-/* Get the "rev" portion of ID, or SVN_INVALID_REVNUM if it is a
- transaction ID. */
-svn_revnum_t svn_fs_x__id_rev(const svn_fs_id_t *id);
-
-/* Access the "item" portion of the ID, or 0 if it is a transaction
- ID. */
-apr_uint64_t svn_fs_x__id_item(const svn_fs_id_t *id);
-
/* Return TRUE, if this is a transaction ID. */
svn_boolean_t svn_fs_x__id_is_txn(const svn_fs_id_t *id);
@@ -149,33 +141,6 @@ svn_string_t *svn_fs_x__id_unparse(const
svn_boolean_t svn_fs_x__id_eq(const svn_fs_id_t *a,
const svn_fs_id_t *b);
-/* Return true if A and B are related. */
-svn_boolean_t svn_fs_x__id_check_related(const svn_fs_id_t *a,
- const svn_fs_id_t *b);
-
-/* Return the noderev relationship between A and B. */
-svn_fs_node_relation_t svn_fs_x__id_compare(const svn_fs_id_t *a,
- const svn_fs_id_t *b);
-
-/* Return 0 if A and B are equal, 1 if A is "greater than" B, -1 otherwise. */
-int svn_fs_x__id_part_compare(const svn_fs_x__id_part_t *a,
- const svn_fs_x__id_part_t *b);
-
-/* Create the txn root ID for transaction TXN_ID. Allocate it in POOL. */
-svn_fs_id_t *svn_fs_x__id_txn_create_root(svn_fs_x__txn_id_t txnnum,
- apr_pool_t *pool);
-
-/* Create the root ID for REVISION. Allocate it in POOL. */
-svn_fs_id_t *svn_fs_x__id_create_root(const svn_revnum_t revision,
- apr_pool_t *pool);
-
-/* Create an ID within a transaction based on NODE_ID, TXN_ID and ITEM
- number, allocated in POOL. */
-svn_fs_id_t *svn_fs_x__id_txn_create(const svn_fs_x__id_part_t *node_id,
- svn_fs_x__txn_id_t txn_id,
- apr_uint64_t item,
- apr_pool_t *pool);
-
/* Create a permanent ID based on NODE_ID and NODEREV_ID, allocated in
POOL. Return NULL, if the NODEREV_ID is "unused". */
svn_fs_id_t *svn_fs_x__id_create(const svn_fs_x__id_part_t *node_id,