mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make xdi_diff_outf interface for running xdiff_outf diffs

Browse Source 
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>
This commit is contained in:
Brian Downing
2008-08-14 00:36:50 -05:00
committed by Junio C Hamano
parent a0653d5505
commit c99db9d292
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
xdiff-interface.c
View File

@ -61,7 +61,7 @@ static void consume_one(void *priv_, char *s, unsigned long size)
}
}
int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
static int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
{
struct xdiff_emit_state *priv = priv_;
int i;
@ -141,6 +141,17 @@ int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t co
return xdl_diff(&a, &b, xpp, xecfg, xecb);
}
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 ret;
xecb->outf = xdiff_outf;
xecb->priv = state;
ret = xdi_diff(mf1, mf2, xpp, xecfg, xecb);
return ret;
}
int read_mmfile(mmfile_t *ptr, const char *filename)
{
struct stat st;