summaryrefslogtreecommitdiff
path: root/src/backend/regex/regexec.c
diff options
context:
space:
mode:
authorTatsuo Ishii2002-08-29 07:22:30 +0000
committerTatsuo Ishii2002-08-29 07:22:30 +0000
commitdb1f0755ab032ab1162f70dd43193da40a596776 (patch)
treeed5ee139ec1eb990f05e7f090835070285d7a608 /src/backend/regex/regexec.c
parent46d140a432dd1a2f1c392dcd8db0620c99a7a56d (diff)
Remove #ifdef MULTIBYTE per hackers list discussion.
Diffstat (limited to 'src/backend/regex/regexec.c')
-rw-r--r--src/backend/regex/regexec.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/backend/regex/regexec.c b/src/backend/regex/regexec.c
index 06459ef1db..59c9ede9f7 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
}