diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-02 08:44:17 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-02 08:44:17 +0200 |
| commit | ca091e6372c4d1b05d2338e878042c2914519a4e (patch) | |
| tree | 406c71091eb4fdf4409147d22e6749309f677e8e /pcre/pcretest.c | |
| parent | 28325b08633372cc343dfcbc41fe252020cf6e6e (diff) | |
| parent | d233fd14a39f9c583b85ffb03e42b5ea52e2f4c2 (diff) | |
| download | mariadb-git-ca091e6372c4d1b05d2338e878042c2914519a4e.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'pcre/pcretest.c')
| -rw-r--r-- | pcre/pcretest.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pcre/pcretest.c b/pcre/pcretest.c index dcf1e2c6760..952de3a663e 100644 --- a/pcre/pcretest.c +++ b/pcre/pcretest.c @@ -500,7 +500,7 @@ enum { #if (defined (SUPPORT_PCRE8) + defined (SUPPORT_PCRE16) + \ defined (SUPPORT_PCRE32)) >= 2 -#define CHAR_SIZE (1 << pcre_mode) +#define CHAR_SIZE (1U << pcre_mode) /* There doesn't seem to be an easy way of writing these macros that can cope with the 3 pairs of bit sizes plus all three bit sizes. So just handle all the @@ -4444,7 +4444,7 @@ while (!done) /* If there is study data, write it. */ - if (extra != NULL) + if (extra != NULL && (extra->flags & PCRE_EXTRA_STUDY_DATA) != 0) { if (fwrite(extra->study_data, 1, true_study_size, f) < true_study_size) @@ -4736,7 +4736,7 @@ while (!done) if (isdigit(*p)) /* Set copy string */ { while(isdigit(*p)) n = n * 10 + *p++ - '0'; - copystrings |= 1 << n; + copystrings |= 1U << n; } else if (isalnum(*p)) { @@ -4799,7 +4799,7 @@ while (!done) if (isdigit(*p)) { while(isdigit(*p)) n = n * 10 + *p++ - '0'; - getstrings |= 1 << n; + getstrings |= 1U << n; } else if (isalnum(*p)) { @@ -5336,7 +5336,7 @@ while (!done) for (i = 0; i < 32; i++) { - if ((copystrings & (1 << i)) != 0) + if ((copystrings & (1U << i)) != 0) { int rc; char copybuffer[256]; @@ -5401,7 +5401,7 @@ while (!done) for (i = 0; i < 32; i++) { - if ((getstrings & (1 << i)) != 0) + if ((getstrings & (1U << i)) != 0) { int rc; const char *substring; |