remove ONIG_CALLOUT_MISMATCH and ONIG_CALLOUT_ABORT

diff --git a/src/oniguruma.h b/src/oniguruma.h
index bb4671bf9656a59c5f9da08b4d5d8d3288bebdef..b2f0b746e88f5538942545e9abdaf99dea56d49c 100644 (file)
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -759,9 +759,7 @@ typedef int (*OnigCalloutFunc)(OnigCalloutArgs* args, void* user_data);
 /* callout function return values (less than -1: error code) */
 typedef enum {
   ONIG_CALLOUT_FAIL     =  1,
-  ONIG_CALLOUT_SUCCESS  =  0,
-  ONIG_CALLOUT_MISMATCH =  ONIG_MISMATCH,  /* == -1 */
-  ONIG_CALLOUT_ABORT    =  ONIG_ABORT      /* == -3 */
+  ONIG_CALLOUT_SUCCESS  =  0
 } OnigCalloutResult;
 
 typedef enum {

diff --git a/src/regexec.c b/src/regexec.c
index 541d2ea5e46e69bfe7f88ac2057c8e918934afb4..35e36986d5f1130e161f9803be3b50121b02a5e2 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -888,8 +888,6 @@ onig_region_copy(OnigRegion* to, OnigRegion* from)
   case ONIG_CALLOUT_FAIL:\
   case ONIG_CALLOUT_SUCCESS:\
     break;\
-  case ONIG_CALLOUT_MISMATCH:\
-  case ONIG_CALLOUT_ABORT:\
   default:\
     if (result > 0) {\
       result = ONIGERR_INVALID_ARGUMENT;\
@@ -3899,9 +3897,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
           case ONIG_CALLOUT_SUCCESS:
             goto retraction_callout2;
             break;
-          case ONIG_CALLOUT_MISMATCH: /* == ONIG_MISMATCH */
-          case ONIG_CALLOUT_ABORT:    /* == ONIG_ABORT */
-            /* fall */
           default: /* error code */
             if (call_result > 0) {
               call_result = ONIGERR_INVALID_ARGUMENT;
@@ -5298,7 +5293,7 @@ onig_builtin_fail(OnigCalloutArgs* args ARG_UNUSED, void* user_data ARG_UNUSED)
 extern int
 onig_builtin_mismatch(OnigCalloutArgs* args ARG_UNUSED, void* user_data ARG_UNUSED)
 {
-  return ONIG_CALLOUT_MISMATCH;
+  return ONIG_MISMATCH;
 }
 
 #if 0