From: K.Kosako Date: Thu, 22 Feb 2018 00:51:39 +0000 (+0900) Subject: refactoring X-Git-Tag: v6.8.0~232 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=605693f93d0e028e5087398a35c17c9b0571f8d2;p=onig refactoring --- diff --git a/src/regcomp.c b/src/regcomp.c index 1c7d791..dd852a7 100644 --- a/src/regcomp.c +++ b/src/regcomp.c @@ -5926,7 +5926,7 @@ free_regex_ext(RegexExt* ext) onig_callout_tag_table_free(ext->tag_table); if (IS_NOT_NULL(ext->callout_list)) - onig_free_callout_list(ext->callout_num, ext->callout_list); + onig_free_reg_callout_list(ext->callout_num, ext->callout_list); #endif xfree(ext); diff --git a/src/regint.h b/src/regint.h index eadd4bc..fb8ec4d 100644 --- a/src/regint.h +++ b/src/regint.h @@ -831,7 +831,7 @@ extern CalloutType onig_get_callout_type_from_name_id(int name_id); extern OnigCalloutFunc onig_get_callout_start_func_from_name_id(int id); extern OnigCalloutFunc onig_get_callout_end_func_from_name_id(int id); extern int onig_callout_tag_table_free(void* table); -extern void onig_free_callout_list(int n, CalloutListEntry* list); +extern void onig_free_reg_callout_list(int n, CalloutListEntry* list); extern CalloutListEntry* onig_reg_callout_list_at(regex_t* reg, int num); #endif diff --git a/src/regparse.c b/src/regparse.c index d9cb6e1..e36cf9c 100644 --- a/src/regparse.c +++ b/src/regparse.c @@ -2371,7 +2371,7 @@ node_new_keep(Node** node, ScanEnv* env) #ifdef USE_CALLOUT extern void -onig_free_callout_list(int n, CalloutListEntry* list) +onig_free_reg_callout_list(int n, CalloutListEntry* list) { int i; int j;