Hi All,
Find the attached patch and log.
With regards
Kamesh Jayachandran
[[[
Patch by: Kamesh Jayachandran <kamesh@collab.net>
Don't use intralibrary prefix for a static function
* subversion/libsvn_diff/token.c
(diff_tree_insert_token): Rename from svn_diff__tree_insert_token.
(svn_diff__get_tokens): Adjust for above rename.
* subversion/libsvn_diff/lcs.c
(diff_snake): Rename from svn_diff__snake.
(svn_diff__lcs): Adjust for above rename.
(diff_lcs_reverse): Rename from svn_diff__lcs_reverse.
(svn_diff__lcs): Adjust for above rename.
]]]
Index: subversion/libsvn_diff/token.c
===================================================================
--- subversion/libsvn_diff/token.c (revision 21374)
+++ subversion/libsvn_diff/token.c (working copy)
@@ -64,10 +64,10 @@
static svn_error_t *
-svn_diff__tree_insert_token(svn_diff__node_t **node, svn_diff__tree_t *tree,
- void *diff_baton,
- const svn_diff_fns_t *vtable,
- apr_uint32_t hash, void *token)
+diff_tree_insert_token(svn_diff__node_t **node, svn_diff__tree_t *tree,
+ void *diff_baton,
+ const svn_diff_fns_t *vtable,
+ apr_uint32_t hash, void *token)
{
svn_diff__node_t *new_node;
svn_diff__node_t **node_ref;
@@ -161,9 +161,9 @@
break;
offset++;
- SVN_ERR(svn_diff__tree_insert_token(&node, tree,
- diff_baton, vtable,
- hash, token));
+ SVN_ERR(diff_tree_insert_token(&node, tree,
+ diff_baton, vtable,
+ hash, token));
/* Create a new position */
position = apr_palloc(pool, sizeof(svn_diff__position_t));
Index: subversion/libsvn_diff/lcs.c
===================================================================
--- subversion/libsvn_diff/lcs.c (revision 21374)
+++ subversion/libsvn_diff/lcs.c (working copy)
@@ -43,11 +43,11 @@
};
static APR_INLINE void
-svn_diff__snake(apr_off_t k,
- svn_diff__snake_t *fp,
- int idx,
- svn_diff__lcs_t **freelist,
- apr_pool_t *pool)
+diff_snake(apr_off_t k,
+ svn_diff__snake_t *fp,
+ int idx,
+ svn_diff__lcs_t **freelist,
+ apr_pool_t *pool)
{
svn_diff__position_t *start_position[2];
svn_diff__position_t *position[2];
@@ -137,7 +137,7 @@
static svn_diff__lcs_t *
-svn_diff__lcs_reverse(svn_diff__lcs_t *lcs)
+diff_lcs_reverse(svn_diff__lcs_t *lcs)
{
svn_diff__lcs_t *next;
svn_diff__lcs_t *prev;
@@ -226,12 +226,12 @@
/* Forward */
for (k = -p; k < d; k++)
{
- svn_diff__snake(k, fp, idx, &lcs_freelist, pool);
+ diff_snake(k, fp, idx, &lcs_freelist, pool);
}
for (k = d + p; k >= d; k--)
{
- svn_diff__snake(k, fp, idx, &lcs_freelist, pool);
+ diff_snake(k, fp, idx, &lcs_freelist, pool);
}
p++;
@@ -239,7 +239,7 @@
while (fp[d].position[1] != &sentinel_position[1]);
lcs->next = fp[d].lcs;
- lcs = svn_diff__lcs_reverse(lcs);
+ lcs = diff_lcs_reverse(lcs);
position_list1->next = sentinel_position[idx].next;
position_list2->next = sentinel_position[abs(1 - idx)].next;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 7 16:33:47 2006