Merge branch 'release/debian/6.9.0-1'debian/6.9.0-1

1 files changed, 0 insertions, 18 deletions

diff --git a/src/regexec.c b/src/regexec.c
index 1ec5183..6c76d85 100644
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -213,8 +213,6 @@ static OpInfoType OpInfo[] = {
   { OP_MEMORY_END_PUSH_REC, "mem-end-push-rec",     ARG_MEMNUM  },
   { OP_MEMORY_END,          "mem-end",              ARG_MEMNUM  },
   { OP_MEMORY_END_REC,      "mem-end-rec",          ARG_MEMNUM  },
-  { OP_SET_OPTION_PUSH,     "set-option-push",      ARG_OPTION  },
-  { OP_SET_OPTION,          "set-option",           ARG_OPTION  },
   { OP_FAIL,                "fail",                 ARG_NON },
   { OP_JUMP,                "jump",                 ARG_RELADDR },
   { OP_PUSH,                "push",                 ARG_RELADDR },
@@ -3484,22 +3482,6 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
       break;
 #endif
 
-#if 0   /* no need: IS_DYNAMIC_OPTION() == 0 */
-    case OP_SET_OPTION_PUSH:  SOP_IN(OP_SET_OPTION_PUSH);
-      GET_OPTION_INC(option, p);
-      STACK_PUSH_ALT(p, s, sprev);
-      p += SIZE_OP_SET_OPTION + SIZE_OP_FAIL;
-      SOP_OUT;
-      continue;
-      break;
-
-    case OP_SET_OPTION:  SOP_IN(OP_SET_OPTION);
-      GET_OPTION_INC(option, p);
-      SOP_OUT;
-      continue;
-      break;
-#endif
-
     case OP_EMPTY_CHECK_START:  SOP_IN(OP_EMPTY_CHECK_START);
       GET_MEMNUM_INC(mem, p);    /* mem: null check id */
       STACK_PUSH_EMPTY_CHECK_START(mem, s);