You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/03/16 11:35:08 UTC
svn commit: r1666951 - /subversion/trunk/subversion/libsvn_diff/diff_memory.c
Author: rhuijben
Date: Mon Mar 16 10:35:08 2015
New Revision: 1666951
URL: http://svn.apache.org/r1666951
Log:
Remove an unused output argument from a diff internal helper function.
* subversion/libsvn_diff/diff_memory.c
(output_merge_token_range): Remove lines_printed argument.
(output_common_modified,
output_latest,
output_conflict,
output_conflict_with_context): Update caller.
Modified:
subversion/trunk/subversion/libsvn_diff/diff_memory.c
Modified: subversion/trunk/subversion/libsvn_diff/diff_memory.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/diff_memory.c?rev=1666951&r1=1666950&r2=1666951&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/diff_memory.c (original)
+++ subversion/trunk/subversion/libsvn_diff/diff_memory.c Mon Mar 16 10:35:08 2015
@@ -822,13 +822,11 @@ make_trailing_context_printer(merge_outp
static svn_error_t *
-output_merge_token_range(apr_size_t *lines_printed_p,
- merge_output_baton_t *btn,
+output_merge_token_range(merge_output_baton_t *btn,
int idx, apr_off_t first,
apr_off_t length)
{
apr_array_header_t *tokens = btn->sources[idx].tokens;
- apr_size_t lines_printed = 0;
for (; length > 0 && first < tokens->nelts; length--, first++)
{
@@ -838,12 +836,8 @@ output_merge_token_range(apr_size_t *lin
/* Note that the trailing context printer assumes that
svn_stream_write is called exactly once per line. */
SVN_ERR(svn_stream_write(btn->output_stream, token->data, &len));
- lines_printed++;
}
- if (lines_printed_p)
- *lines_printed_p = lines_printed;
-
return SVN_NO_ERROR;
}
@@ -866,7 +860,7 @@ output_common_modified(void *baton,
apr_off_t modified_start, apr_off_t modified_length,
apr_off_t latest_start, apr_off_t latest_length)
{
- return output_merge_token_range(NULL, baton, 1/*modified*/,
+ return output_merge_token_range(baton, 1/*modified*/,
modified_start, modified_length);
}
@@ -876,7 +870,7 @@ output_latest(void *baton,
apr_off_t modified_start, apr_off_t modified_length,
apr_off_t latest_start, apr_off_t latest_length)
{
- return output_merge_token_range(NULL, baton, 2/*latest*/,
+ return output_merge_token_range(baton, 2/*latest*/,
latest_start, latest_length);
}
@@ -920,26 +914,26 @@ output_conflict(void *baton,
style == svn_diff_conflict_display_modified_original_latest)
{
SVN_ERR(output_merge_marker(btn, 1/*modified*/));
- SVN_ERR(output_merge_token_range(NULL, btn, 1/*modified*/,
+ SVN_ERR(output_merge_token_range(btn, 1/*modified*/,
modified_start, modified_length));
if (style == svn_diff_conflict_display_modified_original_latest)
{
SVN_ERR(output_merge_marker(btn, 0/*original*/));
- SVN_ERR(output_merge_token_range(NULL, btn, 0/*original*/,
+ SVN_ERR(output_merge_token_range(btn, 0/*original*/,
original_start, original_length));
}
SVN_ERR(output_merge_marker(btn, 2/*separator*/));
- SVN_ERR(output_merge_token_range(NULL, btn, 2/*latest*/,
+ SVN_ERR(output_merge_token_range(btn, 2/*latest*/,
latest_start, latest_length));
SVN_ERR(output_merge_marker(btn, 3/*latest (end)*/));
}
else if (style == svn_diff_conflict_display_modified)
- SVN_ERR(output_merge_token_range(NULL, btn, 1/*modified*/,
+ SVN_ERR(output_merge_token_range(btn, 1/*modified*/,
modified_start, modified_length));
else if (style == svn_diff_conflict_display_latest)
- SVN_ERR(output_merge_token_range(NULL, btn, 2/*latest*/,
+ SVN_ERR(output_merge_token_range(btn, 2/*latest*/,
latest_start, latest_length));
else /* unknown style */
SVN_ERR_MALFUNCTION();
@@ -995,17 +989,17 @@ output_conflict_with_context(void *baton
SVN_ERR(output_conflict_with_context_marker(btn, btn->markers[1],
modified_start,
modified_length));
- SVN_ERR(output_merge_token_range(NULL, btn, 1/*modified*/,
+ SVN_ERR(output_merge_token_range(btn, 1/*modified*/,
modified_start, modified_length));
SVN_ERR(output_conflict_with_context_marker(btn, btn->markers[0],
original_start,
original_length));
- SVN_ERR(output_merge_token_range(NULL, btn, 0/*original*/,
+ SVN_ERR(output_merge_token_range(btn, 0/*original*/,
original_start, original_length));
SVN_ERR(output_merge_marker(btn, 2/*separator*/));
- SVN_ERR(output_merge_token_range(NULL, btn, 2/*latest*/,
+ SVN_ERR(output_merge_token_range(btn, 2/*latest*/,
latest_start, latest_length));
SVN_ERR(output_conflict_with_context_marker(btn, btn->markers[3],
latest_start,