summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-09-01 15:13:22 +0300
committerMonty <monty@mariadb.org>2019-09-01 19:17:34 +0300
commitb23b3a5fb621ca7715c3833075eaa65ccd99a219 (patch)
tree248fa353eebfc961363c686f8be25b7a598accff
parentb0916141c7d2c9e8d7f3cf0e7b36022581ee3bf7 (diff)
downloadmariadb-git-b23b3a5fb621ca7715c3833075eaa65ccd99a219.tar.gz
Fixed some compiler warnings
-rw-r--r--pcre/pcre_dfa_exec.c1
-rw-r--r--pcre/pcre_exec.c2
-rw-r--r--pcre/pcregrep.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/pcre/pcre_dfa_exec.c b/pcre/pcre_dfa_exec.c
index f333381d088..830c4e4be48 100644
--- a/pcre/pcre_dfa_exec.c
+++ b/pcre/pcre_dfa_exec.c
@@ -2198,6 +2198,7 @@ for (;;)
case 0x2029:
#endif /* Not EBCDIC */
if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break;
+ /* fall through */
case CHAR_LF:
ADD_NEW(state_offset + 1, 0);
diff --git a/pcre/pcre_exec.c b/pcre/pcre_exec.c
index 93256d32455..88a9a79e489 100644
--- a/pcre/pcre_exec.c
+++ b/pcre/pcre_exec.c
@@ -2086,7 +2086,7 @@ for (;;)
case OP_CIRC:
if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH);
- /* Start of subject assertion */
+ /* Fall through. Start of subject assertion */
case OP_SOD:
if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH);
diff --git a/pcre/pcregrep.c b/pcre/pcregrep.c
index 1f3b12f2a03..01ad16d680e 100644
--- a/pcre/pcregrep.c
+++ b/pcre/pcregrep.c
@@ -2407,7 +2407,7 @@ handle_option(int letter, int options)
switch(letter)
{
case N_FOFFSETS: file_offsets = TRUE; break;
- case N_HELP: help(); pcregrep_exit(0);
+ case N_HELP: help(); pcregrep_exit(0); break;
case N_LBUFFER: line_buffered = TRUE; break;
case N_LOFFSETS: line_offsets = number = TRUE; break;
case N_NOJIT: study_options &= ~PCRE_STUDY_JIT_COMPILE; break;