[PATCH 1/5] xdiff: add hunk_func()
- From
René Scharfe <rene.scharfe@lsrfire.ath.cx>
- Date
- May 9, 2012, 20:20 UTC
- Message-ID
- <4FAAD1A7.50206@lsrfire.ath.cx>
- In-Reply-To
- <4FAAD13E.8030806@lsrfire.ath.cx>
Add a way to register a callback function that is gets passed the start line and line count of each hunk of a diff. Only standard types are used.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> --- xdiff/xdiff.h | 5 +++++ xdiff/xdiffi.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+)
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h index 09215af..33c010b 100644 --- a/xdiff/xdiff.h +++ b/xdiff/xdiff.h @@ -86,6 +86,10 @@ typedef struct s_xdemitcb { typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv); +typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a, + long start_b, long count_b, + void *cb_data); + typedef struct s_xdemitconf { long ctxlen; long interhunkctxlen; @@ -93,6 +97,7 @@ typedef struct s_xdemitconf { find_func_t find_func; void *find_func_priv; void (*emit_func)(); + xdl_emit_hunk_consume_func_t hunk_func; } xdemitconf_t; typedef struct s_bdiffparam { diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c index bc889e8..4d671f4 100644 --- a/xdiff/xdiffi.c +++ b/xdiff/xdiffi.c @@ -538,6 +538,20 @@ void xdl_free_script(xdchange_t *xscr) { } } +static int xdl_call_hunk_func(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, + xdemitconf_t const *xecfg) +{ + xdchange_t *xch, *xche; + + for (xch = xscr; xch; xch = xche->next) { + xche = xdl_get_hunk(xch, xecfg); + if (xecfg->hunk_func(xch->i1, xche->i1 + xche->chg1 - xch->i1, + xch->i2, xche->i2 + xche->chg2 - xch->i2, + ecb->priv) < 0) + return -1; + } + return 0; +} int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb) { @@ -546,6 +560,9 @@ int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, 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; + if (xdl_do_diff(mf1, mf2, xpp, &xe) < 0) { return -1;
-- 1.7.10.1