Author: philip
Date: Thu Nov 20 22:36:27 2014
New Revision: 1640832
URL: http://svn.apache.org/r1640832
Log:
Followup to r1618841, the old fast_memcpy() returned target+len but
the replacement memcpy() returns target.
* subversion/libsvn_delta/text_delta.c
(patterning_copy): Adjust target after memcpy.
Modified:
subversion/trunk/subversion/libsvn_delta/text_delta.c
Modified: subversion/trunk/subversion/libsvn_delta/text_delta.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/text_delta.c?rev=1640832&r1=1640831&r2=1640832&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/text_delta.c (original)
+++ subversion/trunk/subversion/libsvn_delta/text_delta.c Thu Nov 20 22:36:27
2014
@@ -637,13 +637,17 @@ patterning_copy(char *target, const char
const apr_size_t overlap = target - source;
while (len > overlap)
{
- target = memcpy(target, source, overlap);
+ memcpy(target, source, overlap);
+ target += overlap;
len -= overlap;
}
/* Copy any remaining source pattern. */
if (len)
- target = memcpy(target, source, len);
+ {
+ memcpy(target, source, len);
+ target += len;
+ }
return target;
}