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

5
combine-diff.c
View File

@ -217,8 +217,6 @@ static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
parent_file.size = sz;
xpp.flags = XDF_NEED_MINIMAL;
memset(&xecfg, 0, sizeof(xecfg));
ecb.outf = xdiff_outf;
ecb.priv = &state;
memset(&state, 0, sizeof(state));
state.xm.consume = consume_line;
state.nmask = nmask;
@ -227,7 +225,8 @@ static void combine_diff(const unsigned char *parent, mmfile_t *result_file,
state.num_parent = num_parent;
state.n = n;
xdi_diff(&parent_file, result_file, &xpp, &xecfg, &ecb);
xdi_diff_outf(&parent_file, result_file,
&state.xm, &xpp, &xecfg, &ecb);
free(parent_file.ptr);
/* Assign line numbers for this parent.