From: David Kastrup <dak@gnu.org>
Date: Sat, 22 Feb 2014 16:02:47 +0000 (+0100)
Subject: builtin/blame.c::find_copy_in_blob: no need to scan for region end
X-Git-Tag: v2.0.0-rc0~149^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ee8944fa508675caad9b045af89bc5d845952f3;p=thirdparty%2Fgit.git

builtin/blame.c::find_copy_in_blob: no need to scan for region end

The region end can be looked up just like its beginning.

Signed-off-by: David Kastrup <dak@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/blame.c b/builtin/blame.c
index ec1955d1b0..1c692d890d 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -923,7 +923,6 @@ static void find_copy_in_blob(struct scoreboard *sb,
 			      mmfile_t *file_p)
 {
 	const char *cp;
-	int cnt;
 	mmfile_t file_o;
 	struct handle_split_cb_data d;
 
@@ -934,13 +933,7 @@ static void find_copy_in_blob(struct scoreboard *sb,
 	 */
 	cp = nth_line(sb, ent->lno);
 	file_o.ptr = (char *) cp;
-	cnt = ent->num_lines;
-
-	while (cnt && cp < sb->final_buf + sb->final_buf_size) {
-		if (*cp++ == '\n')
-			cnt--;
-	}
-	file_o.size = cp - file_o.ptr;
+	file_o.size = nth_line(sb, ent->lno + ent->num_lines) - cp;
 
 	/*
 	 * file_o is a part of final image we are annotating.