summaryrefslogtreecommitdiff
path: root/pcre/pcregrep.c
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2018-01-12 18:25:02 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2018-01-26 10:37:46 +0000
commit9891ee5a2aadd2672d8d7f6b217e852344ff86eb (patch)
tree2f5950ed243a10e36e1d8b9609c6426946fe9011 /pcre/pcregrep.c
parent859d100d70a9dba222b229bbc0d5a01194e8ed5f (diff)
downloadmariadb-git-9891ee5a2aadd2672d8d7f6b217e852344ff86eb.tar.gz
Fix and reenable Windows compiler warning C4800 (size_t conversion).
Diffstat (limited to 'pcre/pcregrep.c')
-rw-r--r--pcre/pcregrep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pcre/pcregrep.c b/pcre/pcregrep.c
index 317f7454e13..a58ff823509 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)
{
@@ -2502,7 +2502,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;