Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
builtin/blame.c: struct blame_entry does not need a prev link
author
David Kastrup
<dak@gnu.org>
Wed, 22 Jan 2014 00:20:14 +0000
(
01:20
+0100)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 22 Jan 2014 19:28:01 +0000
(11:28 -0800)
Signed-off-by: David Kastrup <dak@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/blame.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
79fcbf7
)
diff --git
a/builtin/blame.c
b/builtin/blame.c
index e44a6bb30a5a5299c6d57150dd2f23454b25891a..219559551d0304c27462d63f9e8966967dbe1fb1 100644
(file)
--- a/
builtin/blame.c
+++ b/
builtin/blame.c
@@
-197,7
+197,6
@@
static void drop_origin_blob(struct origin *o)
* scoreboard structure, sorted by the target line number.
*/
struct blame_entry {
* scoreboard structure, sorted by the target line number.
*/
struct blame_entry {
- struct blame_entry *prev;
struct blame_entry *next;
/* the first line of this group in the final image;
struct blame_entry *next;
/* 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->num_lines += next->num_lines;
ent->next = next->next;
ent->s_lno + ent->num_lines == next->s_lno) {
ent->num_lines += next->num_lines;
ent->next = next->next;
- if (ent->next)
- ent->next->prev = ent;
origin_decref(next->suspect);
free(next);
ent->score = 0;
origin_decref(next->suspect);
free(next);
ent->score = 0;
@@
-534,7
+531,7
@@
static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)
prev = ent;
/* prev, if not NULL, is the last one that is below e */
prev = ent;
/* prev, if not NULL, is the last one that is below e */
- e->prev = prev;
+
if (prev) {
e->next = prev->next;
prev->next = e;
if (prev) {
e->next = prev->next;
prev->next = e;
@@
-543,8
+540,6
@@
static void add_blame_entry(struct scoreboard *sb, struct blame_entry *e)
e->next = sb->ent;
sb->ent = e;
}
e->next = sb->ent;
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;
origin_incref(src->suspect);
origin_decref(dst->suspect);
memcpy(dst, src, sizeof(*src));
n = dst->next;
origin_incref(src->suspect);
origin_decref(dst->suspect);
memcpy(dst, src, sizeof(*src));
- dst->prev = p;
dst->next = n;
dst->score = 0;
}
dst->next = n;
dst->score = 0;
}
@@
-2502,8
+2495,6
@@
int cmd_blame(int argc, const char **argv, const char *prefix)
ent->suspect = o;
ent->s_lno = bottom;
ent->next = next;
ent->suspect = o;
ent->s_lno = bottom;
ent->next = next;
- if (next)
- next->prev = ent;
origin_incref(o);
}
origin_decref(o);
origin_incref(o);
}
origin_decref(o);