refactoring for escape warnings of LGTM

diff --git a/src/regcomp.c b/src/regcomp.c
index e73ad7c53842a663e54f35d023d427f51bf4d2b5..f2f0f7837dd5ffd95671ff79cfa2119c319f945f 100644 (file)
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -6246,12 +6246,12 @@ onig_free(regex_t* reg)
 static void print_tree P_((FILE* f, Node* node));
 #endif
 
+extern int onig_init_for_match_at(regex_t* reg);
+
 extern int
 onig_compile(regex_t* reg, const UChar* pattern, const UChar* pattern_end,
              OnigErrorInfo* einfo)
 {
-  extern int onig_init_for_match_at(regex_t* reg);
-
   int r;
   Node*  root;
   ScanEnv  scan_env;

diff --git a/src/regexec.c b/src/regexec.c
index 2863faa04f5426f3c34cfb49ea3027c92740bf78..ae6ae4c526d14a489def79648cd4ed4b63f88793 100644 (file)
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -3610,9 +3610,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
         mems = tlen == 1 ? &(p->backref_general.n1) : p->backref_general.ns;
 
         if (backref_check_at_nested_level(reg, stk, stk_base,
-                                          (int )level, (int )tlen, mems) != 0) {
-        }
-        else
+                                          (int )level, (int )tlen, mems) == 0)
           goto fail;
       }
       INC_OP;