refactoring

diff --git a/src/regexec.c b/src/regexec.c
index 87ccf21c41c0492fb5f8a26bfa35d41d2c66a94f..3b3146a84aaabae62785dd50de328999cb46182d 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -2,7 +2,7 @@
   regexec.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2017  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2018  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -474,7 +474,7 @@ onig_set_match_stack_limit_size(unsigned int size)
 static int
 stack_double(int is_alloca, char** arg_alloc_base,
              StackType** arg_stk_base, StackType** arg_stk_end, StackType** arg_stk,
-             OnigMatchArg* msa)
+             MatchArg* msa)
 {
   unsigned int n;
   int used;
@@ -1365,7 +1365,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
 #ifdef USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
          const UChar* in_right_range,
 #endif
-         const UChar* sstart, UChar* sprev, OnigMatchArg* msa)
+         const UChar* sstart, UChar* sprev, MatchArg* msa)
 {
   static UChar FinishCode[] = { OP_FINISH };
 
@@ -3242,7 +3242,7 @@ onig_match(regex_t* reg, const UChar* str, const UChar* end, const UChar* at,
 {
   int r;
   UChar *prev;
-  OnigMatchArg msa;
+  MatchArg msa;
 
   MATCH_ARG_INIT(msa, reg, option, region, at);
   if (region
@@ -3531,7 +3531,7 @@ onig_search(regex_t* reg, const UChar* str, const UChar* end,
 {
   int r;
   UChar *s, *prev;
-  OnigMatchArg msa;
+  MatchArg msa;
   const UChar *orig_start = start;
 #ifdef USE_MATCH_RANGE_MUST_BE_INSIDE_OF_SPECIFIED_RANGE
   const UChar *orig_range = range;

diff --git a/src/regint.h b/src/regint.h
index 8c3ffea1103f74c1c7e7e49b19cfd116bfd2ca30..c0422d25b56e21e7bb91bdd4bd410c980dcb6e98 100644 (file)
--- a/src/regint.h
+++ b/src/regint.h
@@ -4,7 +4,7 @@
   regint.h -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2017  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * Copyright (c) 2002-2018  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -754,7 +754,7 @@ typedef struct {
   int    best_len;      /* for ONIG_OPTION_FIND_LONGEST */
   UChar* best_s;
 #endif
-} OnigMatchArg;
+} MatchArg;
 
 
 typedef struct OnigEndCallListItem {