diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 19:28:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-06 19:28:51 +0300 |
| commit | 70db1e3b8adc1ef88bcbda2e69a30f17b7f87d0f (patch) | |
| tree | 5eea378d9752f55471ea2bc35f83ad5675471485 /pcre | |
| parent | c59a52b7bad473a162a51000f2a24507c83b5fc8 (diff) | |
| parent | 7008d4616421fdf73d109ed297def27fa4679da4 (diff) | |
| download | mariadb-git-70db1e3b8adc1ef88bcbda2e69a30f17b7f87d0f.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'pcre')
| -rw-r--r-- | pcre/pcre_compile.c | 5 | ||||
| -rw-r--r-- | pcre/pcre_exec.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pcre/pcre_compile.c b/pcre/pcre_compile.c index 42f204cdfff..1a916693e69 100644 --- a/pcre/pcre_compile.c +++ b/pcre/pcre_compile.c @@ -1249,6 +1249,7 @@ else if ((c = *ptr) >= CHAR_8) break; + /* fall through */ /* Fall through with a digit less than 8 */ /* \0 always starts an octal number, but we may drop through to here with a @@ -5097,6 +5098,8 @@ for (;; ptr++) either not match or match, depending on whether the class is or is not negated. */ + /* fall through */ + default: if (local_negate && (xclass || tempptr[2] != CHAR_RIGHT_SQUARE_BRACKET)) @@ -7165,7 +7168,7 @@ for (;; ptr++) goto FAILED; } /* Fall through to handle (?P< as (?< is handled */ - + /* fall through */ /* ------------------------------------------------------------ */ DEFINE_NAME: /* Come here from (?< handling */ diff --git a/pcre/pcre_exec.c b/pcre/pcre_exec.c index 1a9bdd546ee..70ac2fea381 100644 --- a/pcre/pcre_exec.c +++ b/pcre/pcre_exec.c @@ -1053,6 +1053,8 @@ for (;;) group. At this point, the return is converted into MATCH_NOMATCH so that previous backup points can be taken. */ + /* fall through */ + case OP_ONCE: case OP_BRA: case OP_SBRA: |