Author: stefan2
Date: Mon Jul 29 16:10:09 2013
New Revision: 1508120
URL: http://svn.apache.org/r1508120
Log:
On the fsx-branch: Rename svn__prefix_string_* API elements
to svn_prefix_string__*.
* subversion/include/private/svn_string_private.h
(svn__prefix_string_*): rename to ...
(svn_prefix_string__*): ... this
* subversion/libsvn_subr/prefix_string.c
(): ditto.
* subversion/libsvn_fs_x/pack.c
(path_order_t,
copy_node_to_temp,
compare_path_order): update user
Modified:
subversion/branches/fsx/subversion/include/private/svn_string_private.h
subversion/branches/fsx/subversion/libsvn_fs_x/pack.c
subversion/branches/fsx/subversion/libsvn_subr/prefix_string.c
Modified:
subversion/branches/fsx/subversion/include/private/svn_string_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/include/private/svn_string_private.h?rev=1508120&r1=1508119&r2=1508120&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/include/private/svn_string_private.h
(original)
+++ subversion/branches/fsx/subversion/include/private/svn_string_private.h Mon
Jul 29 16:10:09 2013
@@ -269,7 +269,7 @@ svn_cstring__reverse_match_length(const
* Prefix trees allow for a space-efficient representation of a set of path-
* like strings, i.e. those that share common prefixes. Any given string
* value will be stored only once, i.e. two strings stored in the same tree
- * are equal if and only if the point to the same #svn__prefix_string_t.
+ * are equal if and only if the point to the same #svn_prefix_string__t.
*
* @defgroup svn_prefix_string Strings in prefix trees.
* @{
@@ -278,7 +278,7 @@ svn_cstring__reverse_match_length(const
/**
* Opaque data type for prefix-tree-based strings.
*/
-typedef struct svn__prefix_string_t svn__prefix_string_t;
+typedef struct svn_prefix_string__t svn_prefix_string__t;
/**
* Opaque data type representing a prefix tree
@@ -295,15 +295,15 @@ svn__prefix_tree_create(apr_pool_t *pool
* Return a string with the value @a s stored in @a tree. If no such string
* exists yet, add it automatically.
*/
-svn__prefix_string_t *
-svn__prefix_string_create(svn__prefix_tree_t *tree,
+svn_prefix_string__t *
+svn_prefix_string__create(svn__prefix_tree_t *tree,
const char *s);
/**
* Return the contents of @a s as a new string object allocated in @a pool.
*/
svn_string_t *
-svn__prefix_string_expand(const svn__prefix_string_t *s,
+svn_prefix_string__expand(const svn_prefix_string__t *s,
apr_pool_t *pool);
/**
@@ -311,8 +311,8 @@ svn__prefix_string_expand(const svn__pre
* tree.
*/
int
-svn__prefix_string_compare(const svn__prefix_string_t *lhs,
- const svn__prefix_string_t *rhs);
+svn_prefix_string__compare(const svn_prefix_string__t *lhs,
+ const svn_prefix_string__t *rhs);
/** @} */
Modified: subversion/branches/fsx/subversion/libsvn_fs_x/pack.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_fs_x/pack.c?rev=1508120&r1=1508119&r2=1508120&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_fs_x/pack.c (original)
+++ subversion/branches/fsx/subversion/libsvn_fs_x/pack.c Mon Jul 29 16:10:09
2013
@@ -84,7 +84,7 @@
typedef struct path_order_t
{
/* changed path */
- svn__prefix_string_t *path;
+ svn_prefix_string__t *path;
/* node ID for this PATH in REVISION */
svn_fs_x__id_part_t node_id;
@@ -669,7 +669,7 @@ copy_node_to_temp(pack_context_t *contex
path_order->expanded_size = noderev->data_rep->expanded_size;
}
- path_order->path = svn__prefix_string_create(context->paths,
+ path_order->path = svn_prefix_string__create(context->paths,
noderev->created_path);
path_order->node_id = *svn_fs_x__id_node_id(noderev->id);
path_order->revision = svn_fs_x__id_rev(noderev->id);
@@ -769,7 +769,7 @@ compare_path_order(const path_order_t *
const path_order_t * rhs = *rhs_p;
/* reverse lexicographic order on path and node (i.e. latest first) */
- int diff = svn__prefix_string_compare(rhs->path, lhs->path);
+ int diff = svn_prefix_string__compare(rhs->path, lhs->path);
if (diff)
return diff;
Modified: subversion/branches/fsx/subversion/libsvn_subr/prefix_string.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_subr/prefix_string.c?rev=1508120&r1=1508119&r2=1508120&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_subr/prefix_string.c (original)
+++ subversion/branches/fsx/subversion/libsvn_subr/prefix_string.c Mon Jul 29
16:10:09 2013
@@ -44,7 +44,7 @@ typedef struct node_t node_t;
/* String type and tree leaf.
*/
-struct svn__prefix_string_t
+struct svn_prefix_string__t
{
/* mandatory prefix */
node_t *prefix;
@@ -63,7 +63,7 @@ struct node_t
{
/* pointer to the parent prefix plus the 1 .. 8 extra chars.
* Only the root will provide 0 extra chars. */
- svn__prefix_string_t key;
+ svn_prefix_string__t key;
/* Length of the prefix from the root down to and including this one.
* 0 for the root node. Only then will key.prefix be NULL. */
@@ -72,7 +72,7 @@ struct node_t
/* Number of entries used in SUB_NODES. */
apr_uint32_t sub_node_count;
- /* The sub-nodes, ordered by first char. node_t and svn__prefix_string_t
+ /* The sub-nodes, ordered by first char. node_t and svn_prefix_string__t
* may be mixed here. May be NULL.
* The number of allocated entries is always a power-of-two and only
* given implicitly by SUB_NODE_COUNT. */
@@ -159,11 +159,11 @@ svn__prefix_tree_create(apr_pool_t *pool
return tree;
}
-svn__prefix_string_t *
-svn__prefix_string_create(svn__prefix_tree_t *tree,
+svn_prefix_string__t *
+svn_prefix_string__create(svn__prefix_tree_t *tree,
const char *s)
{
- svn__prefix_string_t *new_string;
+ svn_prefix_string__t *new_string;
apr_size_t len = strlen(s);
node_t *node = tree->root;
node_t *new_node;
@@ -260,7 +260,7 @@ svn__prefix_string_create(svn__prefix_tr
}
svn_string_t *
-svn__prefix_string_expand(const svn__prefix_string_t *s,
+svn_prefix_string__expand(const svn_prefix_string__t *s,
apr_pool_t *pool)
{
apr_size_t s_len = strlen(s->data);
@@ -283,8 +283,8 @@ svn__prefix_string_expand(const svn__pre
}
int
-svn__prefix_string_compare(const svn__prefix_string_t *lhs,
- const svn__prefix_string_t *rhs)
+svn_prefix_string__compare(const svn_prefix_string__t *lhs,
+ const svn_prefix_string__t *rhs)
{
const node_t *lhs_parent = lhs->prefix;
const node_t *rhs_parent = rhs->prefix;
