threads / patch / 35935

patchbuiltin/blame.c::find_copy_in_blob: no need to scan for line end

Subject: [PATCH] builtin/blame.c::find_copy_in_blob: no need to scan for line end

## tl;dr

2 messages between Feb 22, 2014 and Feb 22, 2014. Diffs are folded; open one to read it.

replies: 1people: 1as markdown or json

David Kastrup· Feb 22, 2014, 15:49 UTC · lore
---
 builtin/blame.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
Show changes to builtin/blame.c +1 −8
diff --git a/builtin/blame.c b/builtin/blame.c
index e44a6bb..96716dd 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -939,7 +939,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;
 
@@ -950,13 +949,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.
-- 
1.8.3.2
David Kastrup· Feb 22, 2014, 15:52 UTC · re: David Kastrup · lore

Re: [PATCH] builtin/blame.c::find_copy_in_blob: no need to scan for line end

David Kastrup <dak@gnu.org> writes:

Oh, good grief. Forgot to sign off, and on rereading, the commit message is clearly subfabulous. So forget this one. The content is fine, though.

-- 
David Kastrup

← back to recent threads