diff options
| author |  René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2012-05-09 22:24:34 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-05-09 14:08:42 -0700 |
| commit | 3319e606336c13ba6475d83e700ca53537cedfd9 (patch) | |
| tree | e7efe531ff5cbed7dc39c80f81cabc258f0ab823 /xdiff | |
| parent | blame: factor out helper for calling xdi_diff() (diff) | |
| download | tgif-3319e606336c13ba6475d83e700ca53537cedfd9.tar.xz | |
xdiff: remove emit_func() and xdi_diff_hunks()
The functions are unused now, remove them.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
| -rw-r--r-- | xdiff/xdiff.h | 1 | ||||
| -rw-r--r-- | xdiff/xdiffi.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 33c010b1f1..219a3bbca6 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -96,7 +96,6 @@ typedef struct s_xdemitconf { unsigned long flags; find_func_t find_func; void *find_func_priv; - void (*emit_func)(); xdl_emit_hunk_consume_func_t hunk_func; } xdemitconf_t; diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c index 4d671f4371..1b7012a119 100644 --- a/xdiff/xdiffi.c +++ b/xdiff/xdiffi.c @@ -557,11 +557,7 @@ int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb) { xdchange_t *xscr; xdfenv_t xe; - emit_func_t ef = xecfg->emit_func ? - (emit_func_t)xecfg->emit_func : xdl_emit_diff; - - if (xecfg->hunk_func) - ef = xdl_call_hunk_func; + emit_func_t ef = xecfg->hunk_func ? xdl_call_hunk_func : xdl_emit_diff; if (xdl_do_diff(mf1, mf2, xpp, &xe) < 0) { |