diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-04 19:05:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-06 00:22:12 -0700 |
| commit | 30b250104d9307e1225031c7fc39b66643265ed1 (patch) | |
| tree | 73b3d00a0e5743a1a4b70937c9f83c78224e6609 /combine-diff.c | |
| parent | 29a3eefde111f6a24292163c4308f00ab3572627 (diff) | |
| download | git-30b250104d9307e1225031c7fc39b66643265ed1.tar.gz | |
Future-proof source for changes in xdemitconf_t
The instances of xdemitconf_t were initialized member by member.
Instead, initialize them to all zero, so we do not have
to update those places each time we introduce a new member.
[jc: minimally fixed by getting rid of a new global]
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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 ea3ca5f950..ef622340a5 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -215,8 +215,7 @@ static void combine_diff(const unsigned char *parent, mmfile_t *result_file, parent_file.ptr = grab_blob(parent, &sz); parent_file.size = sz; xpp.flags = XDF_NEED_MINIMAL; - xecfg.ctxlen = 0; - xecfg.flags = 0; + memset(&xecfg, 0, sizeof(xecfg)); ecb.outf = xdiff_outf; ecb.priv = &state; memset(&state, 0, sizeof(state)); |