You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by jc...@apache.org on 2011/01/24 22:57:57 UTC
svn commit: r1063005 - in
/subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff:
diff.c diff.h diff3.c diff4.c token.c
Author: jcorvel
Date: Mon Jan 24 21:57:56 2011
New Revision: 1063005
URL: http://svn.apache.org/viewvc?rev=1063005&view=rev
Log:
On the diff-optimizations-bytes branch:
Lose the datasource_opened flag of libsvn_diff/token.c#svn_diff__get_tokens,
because all of its callers now pass TRUE for it, since they all open the
datasources themselves.
[in subversion/libsvn_diff]
* diff.h, token.c
(svn_diff__get_tokens): Remove the datasource_opened parameter.
* diff.c, diff3.c, diff4.c:
Adjust callers.
Modified:
subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff.h
subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff3.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff4.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/token.c
Modified: subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff.c?rev=1063005&r1=1063004&r2=1063005&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff.c (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff.c Mon Jan 24 21:57:56 2011
@@ -126,7 +126,6 @@ svn_diff_diff(svn_diff_t **diff,
tree,
diff_baton, vtable,
svn_diff_datasource_original,
- TRUE,
prefix_lines,
subpool));
@@ -134,7 +133,6 @@ svn_diff_diff(svn_diff_t **diff,
tree,
diff_baton, vtable,
svn_diff_datasource_modified,
- TRUE,
prefix_lines,
subpool));
Modified: subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff.h
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff.h?rev=1063005&r1=1063004&r2=1063005&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff.h (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff.h Mon Jan 24 21:57:56 2011
@@ -112,7 +112,6 @@ svn_diff__get_tokens(svn_diff__position_
void *diff_baton,
const svn_diff_fns_t *vtable,
svn_diff_datasource_e datasource,
- svn_boolean_t datasource_opened,
apr_off_t prefix_lines,
apr_pool_t *pool);
Modified: subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff3.c
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff3.c?rev=1063005&r1=1063004&r2=1063005&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff3.c (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff3.c Mon Jan 24 21:57:56 2011
@@ -273,7 +273,6 @@ svn_diff_diff3(svn_diff_t **diff,
tree,
diff_baton, vtable,
svn_diff_datasource_original,
- TRUE,
prefix_lines,
subpool));
@@ -281,7 +280,6 @@ svn_diff_diff3(svn_diff_t **diff,
tree,
diff_baton, vtable,
svn_diff_datasource_modified,
- TRUE,
prefix_lines,
subpool));
@@ -289,7 +287,6 @@ svn_diff_diff3(svn_diff_t **diff,
tree,
diff_baton, vtable,
svn_diff_datasource_latest,
- TRUE,
prefix_lines,
subpool));
Modified: subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff4.c
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff4.c?rev=1063005&r1=1063004&r2=1063005&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff4.c (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/diff4.c Mon Jan 24 21:57:56 2011
@@ -201,7 +201,6 @@ svn_diff_diff4(svn_diff_t **diff,
tree,
diff_baton, vtable,
svn_diff_datasource_original,
- TRUE,
prefix_lines,
subpool2));
@@ -209,7 +208,6 @@ svn_diff_diff4(svn_diff_t **diff,
tree,
diff_baton, vtable,
svn_diff_datasource_modified,
- TRUE,
prefix_lines,
subpool));
@@ -217,7 +215,6 @@ svn_diff_diff4(svn_diff_t **diff,
tree,
diff_baton, vtable,
svn_diff_datasource_latest,
- TRUE,
prefix_lines,
subpool));
@@ -225,7 +222,6 @@ svn_diff_diff4(svn_diff_t **diff,
tree,
diff_baton, vtable,
svn_diff_datasource_ancestor,
- TRUE,
prefix_lines,
subpool2));
Modified: subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/token.c
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/token.c?rev=1063005&r1=1063004&r2=1063005&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/token.c (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/token.c Mon Jan 24 21:57:56 2011
@@ -139,7 +139,6 @@ svn_diff__get_tokens(svn_diff__position_
void *diff_baton,
const svn_diff_fns_t *vtable,
svn_diff_datasource_e datasource,
- svn_boolean_t datasource_opened,
apr_off_t prefix_lines,
apr_pool_t *pool)
{
@@ -153,10 +152,6 @@ svn_diff__get_tokens(svn_diff__position_
*position_list = NULL;
-
- if (!datasource_opened)
- SVN_ERR(vtable->datasource_open(diff_baton, datasource));
-
position_ref = &start_position;
offset = prefix_lines;
hash = 0; /* The callback fn doesn't need to touch it per se */