summaryrefslogtreecommitdiff
path: root/pcre
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-09-01 15:29:34 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-09-01 15:40:49 +0300
commit7f99381288a280c27f74edb3d4ed6bbad4f172b9 (patch)
treecbdeebbabcccd48cb295255e1224acbdda9f203f /pcre
parent6be93c3b8a1d8c080d73750e3804752ad80f56d1 (diff)
downloadmariadb-git-7f99381288a280c27f74edb3d4ed6bbad4f172b9.tar.gz
Fix compiler warnings
metadata_lock_info_duration[]: Remove the unused variable. Add some comments /* fall through */ to silence -Wimplicit-fallthrough
Diffstat (limited to 'pcre')
-rw-r--r--pcre/pcre_compile.c5
-rw-r--r--pcre/pcre_exec.c2
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: