refactoring

diff --git a/src/regcomp.c b/src/regcomp.c
index 95526d1b57f7b6dae17a9e0ffa97e50eaafa2bbb..6efa96c67ceddd1112688586d8cbc81e5a42dea5 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -470,6 +470,16 @@ node_list_add(Node* list, Node* x)
   return n;
 }
 
+static void
+node_conv_to_str_node(Node* node, int flag)
+{
+  NODE_SET_TYPE(node, NODE_STRING);
+  STR_(node)->flag     = flag;
+  STR_(node)->capacity = 0;
+  STR_(node)->s        = STR_(node)->buf;
+  STR_(node)->end      = STR_(node)->buf;
+}
+
 static OnigLen
 distance_add(OnigLen d1, OnigLen d2)
 {
@@ -4930,7 +4940,7 @@ setup_quant(Node* node, regex_t* reg, int state, ScanEnv* env)
 
       if (len * qn->lower <= EXPAND_STRING_MAX_LENGTH) {
         int i, n = qn->lower;
-        onig_node_conv_to_str_node(node, STR_(body)->flag);
+        node_conv_to_str_node(node, STR_(body)->flag);
         for (i = 0; i < n; i++) {
           r = onig_node_str_cat(node, sn->s, sn->end);
           if (r != 0) return r;

diff --git a/src/regparse.c b/src/regparse.c
index 932d1070042082dc8e2b7474f8daf5ed4723f261..150ff0536d1ce33dbcb0c3fc502f86718877c36c 100644 (file)
--- a/src/regparse.c
+++ b/src/regparse.c
@@ -3178,16 +3178,6 @@ node_str_cat_char(Node* node, UChar c)
   return onig_node_str_cat(node, s, s + 1);
 }
 
-extern void
-onig_node_conv_to_str_node(Node* node, int flag)
-{
-  NODE_SET_TYPE(node, NODE_STRING);
-  STR_(node)->flag     = flag;
-  STR_(node)->capacity = 0;
-  STR_(node)->s        = STR_(node)->buf;
-  STR_(node)->end      = STR_(node)->buf;
-}
-
 extern void
 onig_node_str_clear(Node* node)
 {

diff --git a/src/regparse.h b/src/regparse.h
index 5cd07bdb6e06d9f54d63a15883d890d265b3f811..fe5b7144ba8b9fb5cb582e97c18817ed4d4350f8 100644 (file)
--- a/src/regparse.h
+++ b/src/regparse.h
@@ -446,7 +446,6 @@ extern int    onig_strncmp P_((const UChar* s1, const UChar* s2, int n));
 extern void   onig_strcpy P_((UChar* dest, const UChar* src, const UChar* end));
 extern void   onig_scan_env_set_error_string P_((ScanEnv* env, int ecode, UChar* arg, UChar* arg_end));
 extern void   onig_reduce_nested_quantifier P_((Node* pnode, Node* cnode));
-extern void   onig_node_conv_to_str_node P_((Node* node, int flag));
 extern int    onig_node_str_cat P_((Node* node, const UChar* s, const UChar* end));
 extern int    onig_node_str_set P_((Node* node, const UChar* s, const UChar* end));
 extern void   onig_node_free P_((Node* node));