diff options
| author | Tatsuo Ishii <ishii@postgresql.org> | 2002-08-29 07:22:30 +0000 |
|---|---|---|
| committer | Tatsuo Ishii <ishii@postgresql.org> | 2002-08-29 07:22:30 +0000 |
| commit | ed7baeaf4df676489106ab761936cdae9ffb7228 (patch) | |
| tree | 91908d828af2d2c6e4bd96374d932cec73aaf01d /src/backend/regex/regexec.c | |
| parent | 8e80dbb849cc63f6652a5fc645fa4d1e136c3c4c (diff) | |
| download | postgresql-ed7baeaf4df676489106ab761936cdae9ffb7228.tar.gz postgresql-ed7baeaf4df676489106ab761936cdae9ffb7228.zip | |
Remove #ifdef MULTIBYTE per hackers list discussion.
Diffstat (limited to 'src/backend/regex/regexec.c')
| -rw-r--r-- | src/backend/regex/regexec.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c index 06459ef1dbc..59c9ede9f7c 100644 --- a/src/backend/regex/regexec.c +++ b/src/backend/regex/regexec.c @@ -154,10 +154,8 @@ pg_regexec(const regex_t *preg, const char *string, size_t nmatch, { struct re_guts *g = preg->re_g; -#ifdef MULTIBYTE pg_wchar *str; int sts; -#endif #ifdef REDEBUG #define GOODFLAGS(f) (f) @@ -172,7 +170,6 @@ pg_regexec(const regex_t *preg, const char *string, size_t nmatch, return REG_BADPAT; eflags = GOODFLAGS(eflags); -#ifdef MULTIBYTE str = (pg_wchar *) malloc((strlen(string) + 1) * sizeof(pg_wchar)); if (!str) return (REG_ESPACE); @@ -183,12 +180,4 @@ pg_regexec(const regex_t *preg, const char *string, size_t nmatch, sts = lmatcher(g, str, nmatch, pmatch, eflags); free((char *) str); return (sts); - -#else - - if (g->nstates <= CHAR_BIT * sizeof(states1) && !(eflags & REG_LARGE)) - return smatcher(g, (pg_wchar *) string, nmatch, pmatch, eflags); - else - return lmatcher(g, (pg_wchar *) string, nmatch, pmatch, eflags); -#endif } |