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

Merge branch 'maint-1.7.0' into maint

Browse Source 
* maint-1.7.0:
  remove ecb parameter from xdi_diff_outf()
This commit is contained in:
Junio C Hamano
2010-05-04 15:20:47 -07:00
parent 2b873e064c dfea79004c
commit 6b6f5d4664
4 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
xdiff-interface.c
View File

@ -138,19 +138,20 @@ int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t co
int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
xdiff_emit_consume_fn fn, void *consume_callback_data,
xpparam_t const *xpp,
xdemitconf_t const *xecfg, xdemitcb_t *xecb)
xpparam_t const *xpp, xdemitconf_t const *xecfg)
{
int ret;
struct xdiff_emit_state state;
xdemitcb_t ecb;
memset(&state, 0, sizeof(state));
state.consume = fn;
state.consume_callback_data = consume_callback_data;
xecb->outf = xdiff_outf;
xecb->priv = &state;
memset(&ecb, 0, sizeof(ecb));
ecb.outf = xdiff_outf;
ecb.priv = &state;
strbuf_init(&state.remainder, 0);
ret = xdi_diff(mf1, mf2, xpp, xecfg, xecb);
ret = xdi_diff(mf1, mf2, xpp, xecfg, &ecb);
strbuf_release(&state.remainder);
return ret;
}