rename onig_get_tag_start/end() to onig_get_callout_tag_start/end()

diff --git a/src/oniguruma.h b/src/oniguruma.h
index ba8b54f6e1be3cb112da87f49275bc266f540461..a171e5cdeed9991f6dfda958e0a1623a164795fb 100644 (file)
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -985,9 +985,9 @@ unsigned long onig_get_retry_counter_by_callout_args P_((OnigCalloutArgs* args))
 ONIG_EXTERN
 int onig_callout_tag_is_exist_at_callout_num P_((OnigRegex reg, int callout_num));
 ONIG_EXTERN
-const OnigUChar* onig_get_tag_start P_((OnigRegex reg, int callout_num));
+const OnigUChar* onig_get_callout_tag_start P_((OnigRegex reg, int callout_num));
 ONIG_EXTERN
-const OnigUChar* onig_get_tag_end P_((OnigRegex reg, int callout_num));
+const OnigUChar* onig_get_callout_tag_end P_((OnigRegex reg, int callout_num));
 ONIG_EXTERN
 int onig_get_callout_data_dont_clear_old P_((OnigRegex reg, OnigMatchParam* mp, int callout_num, int slot, OnigType* type, OnigValue* val));
 ONIG_EXTERN

diff --git a/src/regexec.c b/src/regexec.c
index 35f9830b0ce8e4899b5c0e2a2d3155bd97fbdb35..9ddcd7dcf6bb21ca9aa0691903142ac914bc8621 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -5582,8 +5582,8 @@ onig_builtin_monitor(OnigCalloutArgs* args, void* user_data)
   string    = onig_get_string_by_callout_args(args);
   strend    = onig_get_string_end_by_callout_args(args);
   reg       = onig_get_regex_by_callout_args(args);
-  tag_start = onig_get_tag_start(reg, num);
-  tag_end   = onig_get_tag_end(reg, num);
+  tag_start = onig_get_callout_tag_start(reg, num);
+  tag_end   = onig_get_callout_tag_end(reg, num);
 
   if (tag_start == 0)
     xsnprintf(buf, sizeof(buf), "#%d", num);

diff --git a/src/regparse.c b/src/regparse.c
index 43f2bb618a25c3c1d8e4a58c7ccc1c517c21636f..f6419dde1161fbad78b1e0659ea2468f8d8af4b6 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -1620,14 +1620,14 @@ onig_get_callout_start_func(regex_t* reg, int callout_num)
 }
 
 extern const UChar*
-onig_get_tag_start(regex_t* reg, int callout_num)
+onig_get_callout_tag_start(regex_t* reg, int callout_num)
 {
   CalloutListEntry* e = onig_reg_callout_list_at(reg, callout_num);
   return e->tag_start;
 }
 
 extern const UChar*
-onig_get_tag_end(regex_t* reg, int callout_num)
+onig_get_callout_tag_end(regex_t* reg, int callout_num)
 {
   CalloutListEntry* e = onig_reg_callout_list_at(reg, callout_num);
   return e->tag_end;