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 /xdiff-interface.h | |
| 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 'xdiff-interface.h')
| -rw-r--r-- | xdiff-interface.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h index f7f791d..6f3b361 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -14,7 +14,9 @@ struct xdiff_emit_state { }; int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); -int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf); +int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, + struct xdiff_emit_state *state, xpparam_t const *xpp, + xdemitconf_t const *xecfg, xdemitcb_t *xecb); int parse_hunk_header(char *line, int len, int *ob, int *on, int *nb, int *nn); |