Author: stefan2
Date: Sun Oct 31 13:25:43 2010
New Revision: 1029335
URL: http://svn.apache.org/viewvc?rev=1029335&view=rev
Log:
Fix testing translate_chunk for (potentially) mixed newline files
when repairing has been disabled.
* subversion/libsvn_subr/subst.c
(translate_chunk): properly test for tristate true
Found by: danielsh
Modified:
subversion/branches/performance/subversion/libsvn_subr/subst.c
Modified: subversion/branches/performance/subversion/libsvn_subr/subst.c
URL:
http://svn.apache.org/viewvc/subversion/branches/performance/subversion/libsvn_subr/subst.c?rev=1029335&r1=1029334&r2=1029335&view=diff
==============================================================================
--- subversion/branches/performance/subversion/libsvn_subr/subst.c (original)
+++ subversion/branches/performance/subversion/libsvn_subr/subst.c Sun Oct 31
13:25:43 2010
@@ -1013,7 +1013,7 @@ translate_chunk(svn_stream_t *dst,
/* skip current EOL */
len += b->eol_str_len;
- /* Check 4 bytes at once to allow for efficient pipilening
+ /* Check 4 bytes at once to allow for efficient pipelining
and to reduce loop condition overhead. */
while ((p + len + 4) <= end)
{
@@ -1033,7 +1033,7 @@ translate_chunk(svn_stream_t *dst,
while ((p + len) < end && !interesting[(unsigned char)p[len]])
++len;
}
- while (b->nl_translation_skippable && /* can skip EOLs at all */
+ while (b->nl_translation_skippable == svn_tristate_true && /* can
skip EOLs at all */
p + len + 2 < end && /* not too close to EOF */
eol_unchanged (b, p + len)); /* EOL format already ok */
