apply: Don't unnecessarily update line lengths in the preimage
PATCH v3 1/5 apply: Don't unnecessarily update line lengths in the preimage
In match_fragment(), the line lengths in the preimage are updated just before calling update_pre_post_images(). That is not necessary, since update_pre_post_images() itself will update the line lengths based on the buffer passed to it.
Signed-off-by Björn Gustavsson <[email protected]>
--- builtin-apply.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-)
builtin-apply.c +6 -11
@@ -1905,20 +1905,15 @@ static int match_fragment(struct image *img, }/* -* Ok, the preimage matches with whitespace fuzz. Update it and -* the common postimage lines to use the same whitespace as the -* target. imgoff now holds the true length of the target that -* matches the preimage, and we need to update the line lengths -* of the preimage to match the target ones. +* Ok, the preimage matches with whitespace fuzz. +* +* imgoff now holds the true length of the target that +* matches the preimage. Update the preimage and +* the common postimage context lines to use the same +* whitespace as the target. */ fixed_buf =xmalloc (imgoff);memcpy (fixed_buf, img->buf + try, imgoff); -for (i =0 ; i < preimage->nr; i++) - preimage->line[i].len = img->line[try_lno+i].len; - -/* -* Update the preimage buffer and the postimage context lines. -*/ update_pre_post_images (preimage, postimage, fixed_buf, imgoff, postlen);return 1 ;
Signature · 1 line
1.7.0