diff options
Diffstat (limited to 'pcre')
| -rw-r--r-- | pcre/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | pcre/pcre_dfa_exec.c | 1 | ||||
| -rw-r--r-- | pcre/pcre_exec.c | 2 | ||||
| -rw-r--r-- | pcre/pcregrep.c | 8 | ||||
| -rw-r--r-- | pcre/pcretest.c | 7 |
5 files changed, 11 insertions, 9 deletions
diff --git a/pcre/CMakeLists.txt b/pcre/CMakeLists.txt index 31d4358f14d..80e402e5713 100644 --- a/pcre/CMakeLists.txt +++ b/pcre/CMakeLists.txt @@ -510,6 +510,6 @@ IF(PCRE_SHOW_REPORT) MESSAGE(STATUS "") ENDIF(PCRE_SHOW_REPORT) -INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) +INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development) # end CMakeLists.txt 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 5982406862b..01ad16d680e 100644 --- a/pcre/pcregrep.c +++ b/pcre/pcregrep.c @@ -951,7 +951,7 @@ Returns: TRUE if the path is not excluded static BOOL test_incexc(char *path, patstr *ip, patstr *ep) { -int plen = strlen(path); +int plen = (int)strlen(path); for (; ep != NULL; ep = ep->next) { @@ -2249,7 +2249,7 @@ if (isdirectory(pathname)) while ((nextfile = readdirectory(dir)) != NULL) { int frc; - int fnlength = strlen(pathname) + strlen(nextfile) + 2; + size_t fnlength = strlen(pathname) + strlen(nextfile) + 2; if (fnlength > 2048) { fprintf(stderr, "pcregrep: recursive filename is too long\n"); @@ -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; @@ -2509,7 +2509,7 @@ compile_pattern(patstr *p, int options, int popts, int fromfile, char buffer[PATBUFSIZE]; const char *error; char *ps = p->string; -int patlen = strlen(ps); +int patlen = (int)strlen(ps); int errptr; if (p->compiled != NULL) return TRUE; diff --git a/pcre/pcretest.c b/pcre/pcretest.c index c1ee128b61f..952de3a663e 100644 --- a/pcre/pcretest.c +++ b/pcre/pcretest.c @@ -1904,7 +1904,7 @@ for (;;) { if (f == stdin) printf("%s", prompt); - if (fgets((char *)here, rlen, f) == NULL) + if (fgets((char *)here, (int)rlen, f) == NULL) return (here == start)? NULL : start; } @@ -2025,7 +2025,7 @@ pcre_uint32 c = 0; int yield = 0; if (length < 0) - length = strlen((char *)p); + length = (int)strlen((char *)p); while (length-- > 0) { @@ -2864,7 +2864,8 @@ strncmpic(pcre_uint8 *s, pcre_uint8 *t, int n) { while (n--) { - int c = tolower(*s++) - tolower(*t++); + int c = tolower(*s) - tolower(*t); + s++; t++; if (c) return c; } return 0; |