diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2010-05-04 22:41:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-04 15:19:14 -0700 |
| commit | dfea79004c54bc96143386d6ac22de500ba4f747 (patch) | |
| tree | ddaea54211bb9e03e0fc699575f74eb01546988c /combine-diff.c | |
| parent | ed215b109fc0e352456ea2ef6a0f8375e28466d5 (diff) | |
| download | git-dfea79004c54bc96143386d6ac22de500ba4f747.tar.gz git-dfea79004c54bc96143386d6ac22de500ba4f747.tar.xz | |
remove ecb parameter from xdi_diff_outf()
xdi_diff_outf() overrides the structure members of its last parameter,
ignoring any value that callers pass in. It's no surprise then that all
callers pass a pointer to an uninitialized structure. They also don't
read it after the call, so the parameter is neither used for input nor
for output. Turn it into a local variable of xdi_diff_outf().
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c index 3480dae82..7557136c8 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -211,7 +211,6 @@ static void combine_diff(const unsigned char *parent, unsigned int mode, xpparam_t xpp; xdemitconf_t xecfg; mmfile_t parent_file; - xdemitcb_t ecb; struct combine_diff_state state; unsigned long sz; @@ -231,7 +230,7 @@ static void combine_diff(const unsigned char *parent, unsigned int mode, state.n = n; xdi_diff_outf(&parent_file, result_file, consume_line, &state, - &xpp, &xecfg, &ecb); + &xpp, &xecfg); free(parent_file.ptr); /* Assign line numbers for this parent. |