Index: user/gabor/tre-integration/include/fastmatch.h =================================================================== --- user/gabor/tre-integration/include/fastmatch.h (revision 225588) +++ user/gabor/tre-integration/include/fastmatch.h (revision 225589) @@ -1,81 +1,82 @@ /* $FreeBSD$ */ #ifndef FASTMATCH_H #define FASTMATCH_H 1 #include #include #include #include typedef struct { size_t wlen; size_t len; wchar_t *wpattern; bool *wescmap; - int hasdot; - int qsBc[UCHAR_MAX + 1]; - int *bmGs; + unsigned int qsBc[UCHAR_MAX + 1]; + unsigned int *bmGs; char *pattern; bool *escmap; - int defBc; + unsigned int defBc; void *qsBc_table; - int *sbmGs; + unsigned int *sbmGs; const char *re_endp; /* flags */ + bool hasdot; bool bol; bool eol; bool word; bool icase; bool newline; bool nosub; bool matchall; + bool reversed; } fastmatch_t; extern int tre_fixcomp(fastmatch_t *preg, const char *regex, int cflags); extern int tre_fastcomp(fastmatch_t *preg, const char *regex, int cflags); extern int tre_fastexec(const fastmatch_t *preg, const char *string, size_t nmatch, regmatch_t pmatch[], int eflags); extern void tre_fastfree(fastmatch_t *preg); extern int tre_fixwcomp(fastmatch_t *preg, const wchar_t *regex, int cflags); extern int tre_fastwcomp(fastmatch_t *preg, const wchar_t *regex, int cflags); extern int tre_fastwexec(const fastmatch_t *preg, const wchar_t *string, size_t nmatch, regmatch_t pmatch[], int eflags); /* Versions with a maximum length argument and therefore the capability to handle null characters in the middle of the strings. */ extern int tre_fixncomp(fastmatch_t *preg, const char *regex, size_t len, int cflags); extern int tre_fastncomp(fastmatch_t *preg, const char *regex, size_t len, int cflags); extern int tre_fastnexec(const fastmatch_t *preg, const char *string, size_t len, size_t nmatch, regmatch_t pmatch[], int eflags); extern int tre_fixwncomp(fastmatch_t *preg, const wchar_t *regex, size_t len, int cflags); extern int tre_fastwncomp(fastmatch_t *preg, const wchar_t *regex, size_t len, int cflags); extern int tre_fastwnexec(const fastmatch_t *preg, const wchar_t *string, size_t len, size_t nmatch, regmatch_t pmatch[], int eflags); #endif /* FASTMATCH_H */