summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2012-05-09 20:22:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-09 21:03:23 (GMT)
commit5d23ec7664ed41afd92d9d8d7ce5e75f87564f0d (patch)
tree3ade3068d5ff0f87ffa2fe4764580f652aacf292
parent0af596c6ffba19bff4362ac532be35abd67d2630 (diff)
downloadgit-5d23ec7664ed41afd92d9d8d7ce5e75f87564f0d.zip
git-5d23ec7664ed41afd92d9d8d7ce5e75f87564f0d.tar.gz
git-5d23ec7664ed41afd92d9d8d7ce5e75f87564f0d.tar.bz2
blame: use hunk_func(), part 2
Use handle_split_cb() directly as hunk_func() callback, without going through xdi_diff_hunks(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/blame.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/builtin/blame.c b/builtin/blame.c
index 9ae5cf3..c83fc7c 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -906,12 +906,15 @@ struct handle_split_cb_data {
long tlno;
};
-static void handle_split_cb(void *data, long same, long p_next, long t_next)
+static int handle_split_cb(long start_a, long count_a,
+ long start_b, long count_b, void *data)
{
struct handle_split_cb_data *d = data;
- handle_split(d->sb, d->ent, d->tlno, d->plno, same, d->parent, d->split);
- d->plno = p_next;
- d->tlno = t_next;
+ handle_split(d->sb, d->ent, d->tlno, d->plno, start_b, d->parent,
+ d->split);
+ d->plno = start_a + count_a;
+ d->tlno = start_b + count_b;
+ return 0;
}
/*
@@ -931,6 +934,8 @@ static void find_copy_in_blob(struct scoreboard *sb,
struct handle_split_cb_data d;
xpparam_t xpp;
xdemitconf_t xecfg;
+ xdemitcb_t ecb;
+
memset(&d, 0, sizeof(d));
d.sb = sb; d.ent = ent; d.parent = parent; d.split = split;
/*
@@ -954,8 +959,11 @@ static void find_copy_in_blob(struct scoreboard *sb,
xpp.flags = xdl_opts;
memset(&xecfg, 0, sizeof(xecfg));
xecfg.ctxlen = 1;
+ xecfg.hunk_func = handle_split_cb;
+ memset(&ecb, 0, sizeof(ecb));
+ ecb.priv = &d;
memset(split, 0, sizeof(struct blame_entry [3]));
- xdi_diff_hunks(file_p, &file_o, handle_split_cb, &d, &xpp, &xecfg);
+ xdi_diff(file_p, &file_o, &xpp, &xecfg, &ecb);
/* remainder, if any, all match the preimage */
handle_split(sb, ent, d.tlno, d.plno, ent->num_lines, parent, split);
}