[PATCH 2/6] xdiff: factor out is_func_rec()
- From
René Scharfe <l.s.r@web.de>
- Date
- Nov 18, 2017, 18:04 UTC
- Message-ID
- <4efcd033-ab8d-7b0c-0c2f-8e5b5cdd5e0c@web.de>
- In-Reply-To
- <790c2344-a71e-7089-9000-f9b37a4a5cd9@web.de>
Add a helper for checking if a given record is a function line. It frees callers from having to deal with the buffer arguments of match_func_rec().
Signed-off-by: Rene Scharfe <l.s.r@web.de> --- xdiff/xemit.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/xdiff/xemit.c b/xdiff/xemit.c index 6881445e4a..c2d5bd004c 100644 --- a/xdiff/xemit.c +++ b/xdiff/xemit.c @@ -121,6 +121,12 @@ static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri, return xecfg->find_func(rec, len, buf, sz, xecfg->find_func_priv); } +static int is_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri) +{ + char dummy[1]; + return match_func_rec(xdf, xecfg, ri, dummy, sizeof(dummy)) >= 0; +} + struct func_line { long len; char buf[80]; @@ -178,7 +184,6 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, /* Appended chunk? */ if (i1 >= xe->xdf1.nrec) { - char dummy[1]; long i2 = xch->i2; /* @@ -186,8 +191,7 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, * a whole function was added. */ while (i2 < xe->xdf2.nrec) { - if (match_func_rec(&xe->xdf2, xecfg, i2, - dummy, sizeof(dummy)) >= 0) + if (is_func_rec(&xe->xdf2, xecfg, i2)) goto post_context_calculation; i2++; }
-- 2.15.0