database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

Move USE_WIDE_UPPER_LOWER define to c.h, and remove TS_USE_WIDE and use

Browse Source 
USE_WIDE_UPPER_LOWER instead.
This commit is contained in:
Bruce Momjian
2008-06-17 16:09:06 +00:00
parent 2e835a4961
commit dc69c0362f
7 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/tsearch/regis.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tsearch/regis.c,v 1.4 2008/01/21 02:46:10 tgl Exp $
* $PostgreSQL: pgsql/src/backend/tsearch/regis.c,v 1.5 2008/06/17 16:09:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -178,7 +178,7 @@ RS_free(Regis *r)
r->node = NULL;
}
#ifdef TS_USE_WIDE
#ifdef USE_WIDE_UPPER_LOWER
static bool
mb_strchr(char *str, char *c)
{

10
src/backend/tsearch/ts_locale.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tsearch/ts_locale.c,v 1.7 2008/01/01 19:45:52 momjian Exp $
* $PostgreSQL: pgsql/src/backend/tsearch/ts_locale.c,v 1.8 2008/06/17 16:09:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,7 +17,7 @@
#include "tsearch/ts_public.h"
#ifdef TS_USE_WIDE
#ifdef USE_WIDE_UPPER_LOWER
/*
* wchar2char --- convert wide characters to multibyte format
@@ -190,7 +190,7 @@ t_isprint(const char *ptr)
return iswprint((wint_t) character[0]);
}
#endif /* TS_USE_WIDE */
#endif /* USE_WIDE_UPPER_LOWER */
/*
@@ -260,7 +260,7 @@ lowerstr_with_len(const char *str, int len)
if (len == 0)
return pstrdup("");
#ifdef TS_USE_WIDE
#ifdef USE_WIDE_UPPER_LOWER
/*
* Use wide char code only when max encoding length > 1 and ctype != C.
@@ -307,7 +307,7 @@ lowerstr_with_len(const char *str, int len)
Assert(wlen < len);
}
else
#endif /* TS_USE_WIDE */
#endif /* USE_WIDE_UPPER_LOWER */
{
const char *ptr = str;
char *outptr;

14
src/backend/tsearch/wparser_def.c
View File

@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.14 2008/01/01 19:45:52 momjian Exp $
* $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.15 2008/06/17 16:09:06 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -238,7 +238,7 @@ typedef struct TParser
/* string and position information */
char *str; /* multibyte string */
int lenstr; /* length of mbstring */
#ifdef TS_USE_WIDE
#ifdef USE_WIDE_UPPER_LOWER
wchar_t *wstr; /* wide character string */
int lenwstr; /* length of wsting */
#endif
@@ -291,7 +291,7 @@ TParserInit(char *str, int len)
prs->str = str;
prs->lenstr = len;
#ifdef TS_USE_WIDE
#ifdef USE_WIDE_UPPER_LOWER
/*
* Use wide char code only when max encoding length > 1.
@@ -328,7 +328,7 @@ TParserClose(TParser *prs)
prs->state = ptr;
}
#ifdef TS_USE_WIDE
#ifdef USE_WIDE_UPPER_LOWER
if (prs->wstr)
pfree(prs->wstr);
#endif
@@ -344,7 +344,7 @@ TParserClose(TParser *prs)
* often are used for Asian languages
*/
#ifdef TS_USE_WIDE
#ifdef USE_WIDE_UPPER_LOWER
#define p_iswhat(type) \
static int \
@@ -439,7 +439,7 @@ p_iseq(TParser *prs, char c)
Assert(prs->state);
return ((prs->state->charlen == 1 && *(prs->str + prs->state->posbyte) == c)) ? 1 : 0;
}
#else /* TS_USE_WIDE */
#else /* USE_WIDE_UPPER_LOWER */
#define p_iswhat(type) \
static int \
@@ -463,7 +463,7 @@ p_iseq(TParser *prs, char c)
p_iswhat(alnum)
p_iswhat(alpha)
#endif /* TS_USE_WIDE */
#endif /* USE_WIDE_UPPER_LOWER */
p_iswhat(digit)
p_iswhat(lower)