refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index 1c7d79188e051837749255fbb617a270b2dc9773..dd852a71d8fedbecfe9f9e805b328659f97055cf 100644 (file)
--- 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 eadd4bc3b752030554b443e4ff4c26cebd5a97ea..fb8ec4d8b06bf8af251649cacd15b030e65b101d 100644 (file)
--- 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 d9cb6e191dfdc08a2310fdee9bfe410c2b30de06..e36cf9c1474ef8d21e88a6e1c28b4d1df8af96f9 100644 (file)
--- 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;