X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=xdiff-interface.c;h=01f14fb50f7cf1387898a0c8db44f966ce07b720;hb=2b72ccb20a3b758afb9de410a955f01d1b411414;hp=b9b0db8d86615d6ca1046b932772f3d9750a8062;hpb=b91ffd37d5c18046f7b0bf47e939273bead9e52e;p=thirdparty%2Fgit.git diff --git a/xdiff-interface.c b/xdiff-interface.c index b9b0db8d86..01f14fb50f 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -309,6 +309,21 @@ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags) } } +void xdiff_clear_find_func(xdemitconf_t *xecfg) +{ + if (xecfg->find_func) { + int i; + struct ff_regs *regs = xecfg->find_func_priv; + + for (i = 0; i < regs->nr; i++) + regfree(®s->array[i].re); + free(regs->array); + free(regs); + xecfg->find_func = NULL; + xecfg->find_func_priv = NULL; + } +} + int git_xmerge_style = -1; int git_xmerge_config(const char *var, const char *value, void *cb)