- Tweaked an initializer to try to avoid a compiler warning.
int wildmatch_iteration_count;
#endif
int wildmatch_iteration_count;
#endif
-static int domatch(const unsigned char *p, const unsigned char *text)
+static int domatch(const uchar *p, const uchar *text)
- unsigned char ch, prev;
#ifdef WILD_TEST_ITERATIONS
wildmatch_iteration_count++;
#ifdef WILD_TEST_ITERATIONS
wildmatch_iteration_count++;
ch = 0; /* This makes "prev" get set to 0. */
}
else if (ch == '[' && p[1] == ':') {
ch = 0; /* This makes "prev" get set to 0. */
}
else if (ch == '[' && p[1] == ':') {
- const unsigned char *s = p += 2;
- while ((ch = *p) && ch != ']') p++;
+ for (s = p += 2; (ch = *p) && ch != ']'; p++) {}
if (!ch)
return ABORT_ALL;
i = p - s - 1;
if (!ch)
return ABORT_ALL;
i = p - s - 1;
#ifdef WILD_TEST_ITERATIONS
wildmatch_iteration_count = 0;
#endif
#ifdef WILD_TEST_ITERATIONS
wildmatch_iteration_count = 0;
#endif
- return domatch((const unsigned char*)p, (const unsigned char*)t) == TRUE;
+ return domatch((const uchar*)p, (const uchar*)t) == TRUE;