userdiff: add xdiff_clear_find_func()
xdiff_set_find_func() is used to set user defined regular expressions for finding function signatures. Add xdiff_clear_find_func(), which frees the memory allocated by the former, making the API complete. Also, use the new function in diff.c (the only call site of xdiff_set_find_func()) to clean up after ourselves. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
725cf7b45d
commit
8cfe5f1cd5
@ -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)
|
||||
|
Reference in New Issue
Block a user