summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-04 15:20:47 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-04 15:20:47 -0700
commit6b6f5d4664c9088636418653a61f600b5e3a9ea4 (patch)
tree8e9f5db3e5efb83423784509a3154c1b11022bfa /xdiff-interface.c
parent2b873e064c4eac816887f823c1dfefbc9c3b4b0e (diff)
parentdfea79004c54bc96143386d6ac22de500ba4f747 (diff)
downloadgit-6b6f5d4664c9088636418653a61f600b5e3a9ea4.tar.gz
Merge branch 'maint-1.7.0' into maint
* maint-1.7.0: remove ecb parameter from xdi_diff_outf()
Diffstat (limited to 'xdiff-interface.c')
-rw-r--r--xdiff-interface.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c
index ca5e3fbae8..cd2285de1c 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -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;
}