remove of member from OnigCalloutArgs

diff --git a/sample/callout.c b/sample/callout.c
index 2d526e55ab854e29c0852548e24535b10a8edd04..7561d1c429d6316b799e015defd8a289d2f9cdce 100644 (file)
--- a/sample/callout.c
+++ b/sample/callout.c
@@ -17,7 +17,6 @@ callout_body(OnigCalloutArgs* args, void* user_data)
   int used_num;
   int used_bytes;
   OnigCalloutIn in;
-  OnigCalloutOf of;
   int name_id;
   UChar* contents;
   const UChar* acontents;
@@ -27,20 +26,17 @@ callout_body(OnigCalloutArgs* args, void* user_data)
   regex_t* regex;
 
   in            = onig_get_callout_in_by_callout_args(args);
-  of            = onig_get_callout_of_by_callout_args(args);
   name_id       = onig_get_name_id_by_callout_args(args);
   start         = onig_get_start_by_callout_args(args);
   current       = onig_get_current_by_callout_args(args);
   regex         = onig_get_regex_by_callout_args(args);
 
   contents = 0;
-  if (of == ONIG_CALLOUT_OF_CONTENTS) {
-    acontents     = onig_get_contents_by_callout_args(args);
+  acontents = onig_get_contents_by_callout_args(args);
+  if (acontents != 0) {
+    OnigEncoding enc = onig_get_encoding(regex);
     acontents_end = onig_get_contents_end_by_callout_args(args);
-    if (acontents != 0) {
-      OnigEncoding enc = onig_get_encoding(regex);
-      contents = onigenc_strdup(enc, acontents, acontents_end);
-    }
+    contents = onigenc_strdup(enc, acontents, acontents_end);
   }
 
   if (name_id != ONIG_NON_NAME_ID) {
@@ -49,7 +45,7 @@ callout_body(OnigCalloutArgs* args, void* user_data)
   }
   fprintf(stdout,
           "%s %s: contents: \"%s\", start: \"%s\", current: \"%s\"\n",
-          of == ONIG_CALLOUT_OF_CONTENTS ? "CONTENTS" : "NAME",
+          contents != 0 ? "CONTENTS" : "NAME",
           in == ONIG_CALLOUT_IN_PROGRESS ? "PROGRESS" : "RETRACTION",
           contents, start, current);
 

diff --git a/src/oniguruma.h b/src/oniguruma.h
index d52828d8cfde77ca340c80579b90a16598005b1f..b575a25b7c54b3f78783af683c3e02530ad64d2c 100644 (file)
--- a/src/oniguruma.h
+++ b/src/oniguruma.h
@@ -959,8 +959,6 @@ int onig_get_callout_num_by_callout_args P_((OnigCalloutArgs* args));
 ONIG_EXTERN
 OnigCalloutIn onig_get_callout_in_by_callout_args P_((OnigCalloutArgs* args));
 ONIG_EXTERN
-OnigCalloutOf onig_get_callout_of_by_callout_args P_((OnigCalloutArgs* args));
-ONIG_EXTERN
 int onig_get_name_id_by_callout_args P_((OnigCalloutArgs* args));
 ONIG_EXTERN
 const OnigUChar* onig_get_contents_by_callout_args P_((OnigCalloutArgs* args));

diff --git a/src/regexec.c b/src/regexec.c
index 7c7f9e71509206bfecdf31e44482119a2cc6b406..0eeee91fd12707cf3c5de408c73a6cc2b0be0dc1 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -862,9 +862,8 @@ onig_region_copy(OnigRegion* to, OnigRegion* from)
 }
 
 #ifdef USE_CALLOUT
-#define CALLOUT_BODY(func, ain, aof, aname_id, anum, user, args, result) do { \
+#define CALLOUT_BODY(func, ain, aname_id, anum, user, args, result) do { \
   args.in            = (ain);\
-  args.of            = (aof);\
   args.name_id       = (aname_id);\
   args.num           = anum;\
   args.regex         = reg;\
@@ -882,10 +881,10 @@ onig_region_copy(OnigRegion* to, OnigRegion* from)
   result = (func)(&args, user);\
 } while (0)
 
-#define RETRACTION_CALLOUT(func, aof, aname_id, anum, user) do {\
+#define RETRACTION_CALLOUT(func, aname_id, anum, user) do {\
   int result;\
   OnigCalloutArgs args;\
-  CALLOUT_BODY(func, ONIG_CALLOUT_IN_RETRACTION, aof, aname_id, anum, user, args, result);\
+  CALLOUT_BODY(func, ONIG_CALLOUT_IN_RETRACTION, aname_id, anum, user, args, result);\
   switch (result) {\
   case ONIG_CALLOUT_FAIL:\
     goto fail;\
@@ -994,7 +993,6 @@ typedef struct _StackType {
 
 struct OnigCalloutArgsStruct {
   OnigCalloutIn    in;
-  OnigCalloutOf    of;
   int              name_id;   /* name id or ONIG_NON_NAME_ID */
   int              num;
   OnigRegex        regex;
@@ -1699,14 +1697,7 @@ stack_double(int is_alloca, char** arg_alloc_base,
 #ifdef USE_CALLOUT
 #define POP_CALLOUT_CASE \
   else if (stk->type == STK_CALLOUT) {\
-    int aof;\
-    if (stk->zid < 0) {\
-      aof = ONIG_CALLOUT_OF_CONTENTS;\
-    }\
-    else {\
-      aof = ONIG_CALLOUT_OF_NAME;\
-    }\
-    RETRACTION_CALLOUT(stk->u.callout.func, aof, stk->zid, stk->u.callout.num, msa->mp->callout_user_data);\
+    RETRACTION_CALLOUT(stk->u.callout.func, stk->zid, stk->u.callout.num, msa->mp->callout_user_data);\
   }
 #else
 #define POP_CALLOUT_CASE
@@ -3857,7 +3848,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         }
 
         if (IS_NOT_NULL(func) && (in & ONIG_CALLOUT_IN_PROGRESS) != 0) {
-          CALLOUT_BODY(func, ONIG_CALLOUT_IN_PROGRESS, of, name_id,
+          CALLOUT_BODY(func, ONIG_CALLOUT_IN_PROGRESS, name_id,
                        num, msa->mp->callout_user_data, args, call_result);
           switch (call_result) {
           case ONIG_CALLOUT_FAIL:
@@ -5062,12 +5053,6 @@ onig_get_callout_in_by_callout_args(OnigCalloutArgs* args)
   return args->in;
 }
 
-extern OnigCalloutOf
-onig_get_callout_of_by_callout_args(OnigCalloutArgs* args)
-{
-  return args->of;
-}
-
 extern int
 onig_get_name_id_by_callout_args(OnigCalloutArgs* args)
 {