refactoring

diff --git a/sample/callout.c b/sample/callout.c
index 40071621fb8849c83527f5dbcdf869968341a6b9..b6d308f5ac1e93d8fa3738288c1d073fa3c5af54 100644 (file)
--- a/sample/callout.c
+++ b/sample/callout.c
@@ -43,7 +43,7 @@ callout_body(OnigCalloutArgs* args, void* user_data)
     content = 0;
 
   if (name_id != ONIG_NO_NAME_ID) {
-    UChar* name = onig_get_callout_name_from_id(name_id);
+    UChar* name = onig_get_callout_name_from_name_id(name_id);
     fprintf(stdout, "name: %s\n", name);
   }
   fprintf(stdout,

diff --git a/src/oniguruma.h b/src/oniguruma.h
index 99f9ae752e1a72628d0bdadc0f0241b6b4145eb2..920fd1bdc0770a4d0f8cae59c101af2d1801c980 100644 (file)
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -930,7 +930,7 @@ int onig_set_retraction_callout_of_code P_((OnigCalloutFunc f));
 ONIG_EXTERN
 int onig_set_callout_of_name P_((OnigUChar* name, OnigUChar* name_end, int callout_in, OnigCalloutFunc callout, int arg_num, OnigType arg_types[], int optional_arg_num, OnigValue opt_defaults[])); /* name: single-byte string */
 ONIG_EXTERN
-OnigUChar* onig_get_callout_name_from_id P_((int id));
+OnigUChar* onig_get_callout_name_from_name_id P_((int id));
 
 /* used in callout functions */
 ONIG_EXTERN

diff --git a/src/regexec.c b/src/regexec.c
index 24be3ac69b420196a69dd0138aca4f210171e361..d19597d87613592902b3a1a6c05b8c63bfd792fc 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -1550,7 +1550,7 @@ stack_double(int is_alloca, char** arg_alloc_base,
     }\
     else {\
       aof = ONIG_CALLOUT_OF_NAME;\
-      func = onig_get_callout_start_func_from_id(stk->zid);\
+      func = onig_get_callout_start_func_from_name_id(stk->zid);\
     }\
     RETRACTION_CALLOUT(func, aof, stk->zid, stk->u.callout.num, stk->u.callout.content, stk->u.callout.content_end, msa->mp->callout_user_data);\
   }
@@ -3688,7 +3688,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 
         of = ONIG_CALLOUT_OF_NAME;
         GET_MEMNUM_INC(name_id, p);
-        func = onig_get_callout_start_func_from_id(name_id);
+        func = onig_get_callout_start_func_from_name_id(name_id);
 
       callout_common_entry:
         GET_MEMNUM_INC(num,  p);
@@ -3722,7 +3722,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         retraction_callout2:
           if ((dirs & ONIG_CALLOUT_IN_RETRACTION) != 0) {
             if (of == ONIG_CALLOUT_OF_NAME) {
-              func = onig_get_callout_start_func_from_id(name_id);
+              func = onig_get_callout_start_func_from_name_id(name_id);
               if (IS_NOT_NULL(func)) {
                 STACK_PUSH_CALLOUT_NAME(name_id, num, content_start, content_end);
               }

diff --git a/src/regint.h b/src/regint.h
index b0718bd79c46ab8b89949252bedfb4e7011ff55c..c721f80abae1bbbb328e63a7038c2cc16dd0e0ab 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -799,7 +799,7 @@ typedef enum {
   CALLOUT_TYPE_START_MARK_END_CALL = 3,
 } CalloutType;
 
-extern OnigCalloutFunc onig_get_callout_start_func_from_id(int 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);
 #endif

diff --git a/src/regparse.c b/src/regparse.c
index 2be9d16529000607b76aa070ee97beef7b025707..9331474e991bccc5108a4d3d0edba3e2afb67b28 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -1536,7 +1536,7 @@ onig_get_callout_id_from_name(OnigEncoding enc, UChar* name, UChar* name_end,
 }
 
 extern OnigCalloutFunc
-onig_get_callout_start_func_from_id(int name_id)
+onig_get_callout_start_func_from_name_id(int name_id)
 {
   return CalloutNameFuncList->v[name_id].start_func;
 }
@@ -1578,9 +1578,9 @@ get_callout_opt_default_from_name_id(int name_id, int index)
 }
 
 extern UChar*
-onig_get_callout_name_from_id(int id)
+onig_get_callout_name_from_name_id(int name_id)
 {
-  return CalloutNameFuncList->v[id].name;
+  return CalloutNameFuncList->v[name_id].name;
 }
 
 extern int