diff options
| author | Brian Downing <bdowning@lavos.net> | 2008-08-14 05:36:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-14 06:10:23 (GMT) |
| commit | c99db9d292c5f63c83ae2b441a67121d76553413 (patch) | |
| tree | bdb63fae285ccaa9b54dbe9a4bde0ec1ac41bc96 /builtin-blame.c | |
| parent | a0653d550524a0263d36fde6a8cf98941dd057ab (diff) | |
| download | git-c99db9d292c5f63c83ae2b441a67121d76553413.zip git-c99db9d292c5f63c83ae2b441a67121d76553413.tar.gz git-c99db9d292c5f63c83ae2b441a67121d76553413.tar.bz2 | |
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.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index 4ea3431..8cca3b1 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; |