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 2011/01/08 03:57:45 UTC
svn commit: r1056607 - /subversion/trunk/subversion/libsvn_diff/parse-diff.c
Author: stsp
Date: Sat Jan 8 02:57:45 2011
New Revision: 1056607
URL: http://svn.apache.org/viewvc?rev=1056607&view=rev
Log:
* subversion/libsvn_diff/parse-diff.c
(svn_diff_hunk_readline_diff_text): Use local variable instead of modifying
output parameter early. No functional change.
Modified:
subversion/trunk/subversion/libsvn_diff/parse-diff.c
Modified: subversion/trunk/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/parse-diff.c?rev=1056607&r1=1056606&r2=1056607&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/parse-diff.c Sat Jan 8 02:57:45 2011
@@ -537,22 +537,22 @@ svn_diff_hunk_readline_diff_text(svn_dif
if (parse_hunk_header(line->data, &dummy, "@@", scratch_pool))
{
/* Line is a hunk header, reverse it. */
- *stringbuf = svn_stringbuf_createf(result_pool,
- "@@ -%lu,%lu +%lu,%lu @@",
- hunk->modified_start,
- hunk->modified_length,
- hunk->original_start,
- hunk->original_length);
+ line = svn_stringbuf_createf(result_pool,
+ "@@ -%lu,%lu +%lu,%lu @@",
+ hunk->modified_start,
+ hunk->modified_length,
+ hunk->original_start,
+ hunk->original_length);
}
else if (parse_hunk_header(line->data, &dummy, "##", scratch_pool))
{
/* Line is a hunk header, reverse it. */
- *stringbuf = svn_stringbuf_createf(result_pool,
- "## -%lu,%lu +%lu,%lu ##",
- hunk->modified_start,
- hunk->modified_length,
- hunk->original_start,
- hunk->original_length);
+ line = svn_stringbuf_createf(result_pool,
+ "## -%lu,%lu +%lu,%lu ##",
+ hunk->modified_start,
+ hunk->modified_length,
+ hunk->original_start,
+ hunk->original_length);
}
else
{
@@ -560,12 +560,10 @@ svn_diff_hunk_readline_diff_text(svn_dif
line->data[0] = '-';
else if (line->data[0] == '-')
line->data[0] = '+';
-
- *stringbuf = line;
}
}
- else
- *stringbuf = line;
+
+ *stringbuf = line;
return SVN_NO_ERROR;
}