undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/blame.c: struct blame_entry does not need a prev link

Browse Source 
Signed-off-by: David Kastrup <dak@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Kastrup 2014-01-22 01:20:14 +01:00 committed by Junio C Hamano
parent 79fcbf7e70
commit a0f58c5830
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/blame.c
View File

@ -197,7 +197,6 @@ static void drop_origin_blob(struct origin *o)
* scoreboard structure, sorted by the target line number. * scoreboard structure, sorted by the target line number.
*/ */
struct blame_entry { struct blame_entry {
struct blame_entry *prev;
struct blame_entry *next; struct blame_entry *next;
/* the first line of this group in the final image; /* the first line of this group in the final image;
@ -282,8 +281,6 @@ static void coalesce(struct scoreboard *sb)
ent->s_lno + ent->num_lines == next->s_lno) { ent->s_lno + ent->num_lines == next->s_lno) {
ent->num_lines += next->num_lines; ent->num_lines += next->num_lines;
ent->next = next->next; ent->next = next->next;
if (ent->next)
ent->next->prev = ent;
origin_decref(next->suspect); origin_decref(next->suspect);
free(next); free(next);
ent->score = 0; ent->score = 0;
@ -534,7 +531,7 @@ static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)
prev = ent; prev = ent;
/* prev, if not NULL, is the last one that is below e */ /* prev, if not NULL, is the last one that is below e */
e->prev = prev;
if (prev) { if (prev) {
e->next = prev->next; e->next = prev->next;
prev->next = e; prev->next = e;
@ -543,8 +540,6 @@ static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)
e->next = sb->ent; e->next = sb->ent;
sb->ent = e; sb->ent = e;
} }
if (e->next)
e->next->prev = e;
} }
/* /*
@ -555,14 +550,12 @@ static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)
*/ */
static void dup_entry(struct blame_entry *dst, struct blame_entry *src) static void dup_entry(struct blame_entry *dst, struct blame_entry *src)
{ {
struct blame_entry *p, *n; struct blame_entry *n;
p = dst->prev;
n = dst->next; n = dst->next;
origin_incref(src->suspect); origin_incref(src->suspect);
origin_decref(dst->suspect); origin_decref(dst->suspect);
memcpy(dst, src, sizeof(*src)); memcpy(dst, src, sizeof(*src));
dst->prev = p;
dst->next = n; dst->next = n;
dst->score = 0; dst->score = 0;
} }
@ -2502,8 +2495,6 @@ parse_done:
ent->suspect = o; ent->suspect = o;
ent->s_lno = bottom; ent->s_lno = bottom;
ent->next = next; ent->next = next;
if (next)
next->prev = ent;
origin_incref(o); origin_incref(o);
} }
origin_decref(o); origin_decref(o);