cleanup merge

remicollet · remicollet · commit 0d9935739c3a · 2019-01-08T09:33:41.000+01:00
diff --git a/ext/mbstring/oniguruma/src/regparse.c b/ext/mbstring/oniguruma/src/regparse.c
@@ -3596,7 +3596,6 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)
           tok->u.code = c2;
         }
         else { /* string */
-          p = tok->backp + enclen(enc, tok->backp);
           int len;
           SAFE_ENC_LEN(enc, tok->backp, end, len);
           p = tok->backp + len;

Original file line number	Diff line number	Diff line change
`@@ -3596,7 +3596,6 @@ fetch_token(OnigToken* tok, UChar** src, UChar* end, ScanEnv* env)`
`3596`	`3596`	`tok->u.code = c2;`
`3597`	`3597`	`}`
`3598`	`3598`	`else { /* string */`
`3599`		`- p = tok->backp + enclen(enc, tok->backp);`
`3600`	`3599`	`int len;`
`3601`	`3600`	`SAFE_ENC_LEN(enc, tok->backp, end, len);`
`3602`	`3601`	`p = tok->backp + len;`