diff options
Diffstat (limited to 'pcre')
| -rw-r--r-- | pcre/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | pcre/pcregrep.c | 6 | ||||
| -rw-r--r-- | pcre/pcretest.c | 4 |
3 files changed, 6 insertions, 6 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/pcregrep.c b/pcre/pcregrep.c index a406be962d7..79d9e286c75 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, "pcre2grep: recursive filename is too long\n"); @@ -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 f1303037281..a0e65ed9808 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) { |