undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xdiff: remove emit_func() and xdi_diff_hunks()

Browse Source 
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>
This commit is contained in:
René Scharfe 2012-05-09 22:24:34 +02:00 committed by Junio C Hamano
parent 4b4132fd89
commit 3319e60633
4 changed files with 1 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
xdiff-interface.c
View File

@ -156,50 +156,6 @@ int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
return ret; return ret;
} }
struct xdiff_emit_hunk_state {
xdiff_emit_hunk_consume_fn consume;
void *consume_callback_data;
};
static int process_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
xdemitconf_t const *xecfg)
{
long s1, s2, same, p_next, t_next;
xdchange_t *xch, *xche;
struct xdiff_emit_hunk_state *state = ecb->priv;
xdiff_emit_hunk_consume_fn fn = state->consume;
void *consume_callback_data = state->consume_callback_data;
for (xch = xscr; xch; xch = xche->next) {
xche = xdl_get_hunk(xch, xecfg);
s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0);
s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0);
same = s2 + XDL_MAX(xch->i1 - s1, 0);
p_next = xche->i1 + xche->chg1;
t_next = xche->i2 + xche->chg2;
fn(consume_callback_data, same, p_next, t_next);
}
return 0;
}
int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2,
xdiff_emit_hunk_consume_fn fn, void *consume_callback_data,
xpparam_t const *xpp, xdemitconf_t *xecfg)
{
struct xdiff_emit_hunk_state state;
xdemitcb_t ecb;
memset(&state, 0, sizeof(state));
memset(&ecb, 0, sizeof(ecb));
state.consume = fn;
state.consume_callback_data = consume_callback_data;
xecfg->emit_func = (void (*)())process_diff;
ecb.priv = &state;
return xdi_diff(mf1, mf2, xpp, xecfg, &ecb);
}
int read_mmfile(mmfile_t *ptr, const char *filename) int read_mmfile(mmfile_t *ptr, const char *filename)
{ {
struct stat st; struct stat st;

4
xdiff-interface.h
View File

@ -4,15 +4,11 @@
#include "xdiff/xdiff.h" #include "xdiff/xdiff.h"
typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long); typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long);
typedef void (*xdiff_emit_hunk_consume_fn)(void *, long, long, long);
int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb);
int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2, int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
xdiff_emit_consume_fn fn, void *consume_callback_data, xdiff_emit_consume_fn fn, void *consume_callback_data,
xpparam_t const *xpp, xdemitconf_t const *xecfg); xpparam_t const *xpp, xdemitconf_t const *xecfg);
int xdi_diff_hunks(mmfile_t *mf1, mmfile_t *mf2,
xdiff_emit_hunk_consume_fn fn, void *consume_callback_data,
xpparam_t const *xpp, xdemitconf_t *xecfg);
int parse_hunk_header(char *line, int len, int parse_hunk_header(char *line, int len,
int *ob, int *on, int *ob, int *on,
int *nb, int *nn); int *nb, int *nn);

1
xdiff/xdiff.h
View File

@ -96,7 +96,6 @@ typedef struct s_xdemitconf {
unsigned long flags; unsigned long flags;
find_func_t find_func; find_func_t find_func;
void *find_func_priv; void *find_func_priv;
void (*emit_func)();
xdl_emit_hunk_consume_func_t hunk_func; xdl_emit_hunk_consume_func_t hunk_func;
} xdemitconf_t; } xdemitconf_t;

6
xdiff/xdiffi.c
View File

@ -557,11 +557,7 @@ int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
xdemitconf_t const *xecfg, xdemitcb_t *ecb) { xdemitconf_t const *xecfg, xdemitcb_t *ecb) {
xdchange_t *xscr; xdchange_t *xscr;
xdfenv_t xe; xdfenv_t xe;
emit_func_t ef = xecfg->emit_func ? emit_func_t ef = xecfg->hunk_func ? xdl_call_hunk_func : xdl_emit_diff;
(emit_func_t)xecfg->emit_func : xdl_emit_diff;
if (xecfg->hunk_func)
ef = xdl_call_hunk_func;
if (xdl_do_diff(mf1, mf2, xpp, &xe) < 0) { if (xdl_do_diff(mf1, mf2, xpp, &xe) < 0) {