summaryrefslogtreecommitdiff
path: root/builtin-blame.c
diff options
context:
space:
mode:
authorBrian Downing <bdowning@lavos.net>2008-08-14 00:36:50 -0500
committerJunio C Hamano <gitster@pobox.com>2008-08-13 23:10:23 -0700
commitc99db9d292c5f63c83ae2b441a67121d76553413 (patch)
treebdb63fae285ccaa9b54dbe9a4bde0ec1ac41bc96 /builtin-blame.c
parenta0653d550524a0263d36fde6a8cf98941dd057ab (diff)
downloadgit-c99db9d292c5f63c83ae2b441a67121d76553413.tar.gz
Make xdi_diff_outf interface for running xdiff_outf diffs
To prepare for the need to initialize and release resources for an xdi_diff with the xdiff_outf output function, make a new function to wrap this usage. Old: ecb.outf = xdiff_outf; ecb.priv = &state; ... xdi_diff(file_p, file_o, &xpp, &xecfg, &ecb); New: xdi_diff_outf(file_p, file_o, &state.xm, &xpp, &xecfg, &ecb); Signed-off-by: Brian Downing <bdowning@lavos.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-blame.c')
-rw-r--r--builtin-blame.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin-blame.c b/builtin-blame.c
index 4ea343189f..8cca3b16d2 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -528,15 +528,13 @@ static struct patch *compare_buffer(mmfile_t *file_p, mmfile_t *file_o,
xpp.flags = xdl_opts;
memset(&xecfg, 0, sizeof(xecfg));
xecfg.ctxlen = context;
- ecb.outf = xdiff_outf;
- ecb.priv = &state;
memset(&state, 0, sizeof(state));
state.xm.consume = process_u_diff;
state.ret = xmalloc(sizeof(struct patch));
state.ret->chunks = NULL;
state.ret->num = 0;
- xdi_diff(file_p, file_o, &xpp, &xecfg, &ecb);
+ xdi_diff_outf(file_p, file_o, &state.xm, &xpp, &xecfg, &ecb);
if (state.ret->num) {
struct chunk *chunk;