Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit77f7763

Browse files
committed
Remove all traces of multibyte and locale options. Clean up comments
referring to "multibyte" where it really means character encoding.
1 parent86f2732 commit77f7763

File tree

47 files changed

+127
-284
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+127
-284
lines changed

‎configure

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1632,17 +1632,6 @@ echo "$as_me:$LINENO: result: $enable_recode" >&5
16321632
echo"${ECHO_T}$enable_recode">&6
16331633
16341634
1635-
#
1636-
# Multibyte support
1637-
#
1638-
MULTIBYTE=SQL_ASCII
1639-
1640-
cat>>confdefs.h<<\_ACEOF
1641-
#define MULTIBYTE 1
1642-
_ACEOF
1643-
1644-
1645-
16461635
#
16471636
# NLS
16481637
#
@@ -16275,7 +16264,6 @@ s,@host_vendor@,$host_vendor,;t t
1627516264
s,@host_os@,$host_os,;t t
1627616265
s,@PORTNAME@,$PORTNAME,;t t
1627716266
s,@TAS@,$TAS,;t t
16278-
s,@MULTIBYTE@,$MULTIBYTE,;t t
1627916267
s,@enable_nls@,$enable_nls,;t t
1628016268
s,@WANTED_LANGUAGES@,$WANTED_LANGUAGES,;t t
1628116269
s,@default_port@,$default_port,;t t

‎configure.in

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.201 2002/09/02 16:14:01 momjian Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.202 2002/09/03 21:45:41 petere Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -161,13 +161,6 @@ PGAC_ARG_BOOL(enable, recode, no, [ --enable-recode enable character se
161161
AC_MSG_RESULT([$enable_recode])
162162

163163

164-
#
165-
# Multibyte support
166-
#
167-
MULTIBYTE=SQL_ASCII
168-
AC_DEFINE(MULTIBYTE, 1, [Set to 1 if you want to use multibyte characters (--enable-multibyte)])
169-
AC_SUBST(MULTIBYTE)
170-
171164
#
172165
# NLS
173166
#

‎contrib/tsearch/dict.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
#defineTABLE_DICT_END}
33

44
#include"dict/porter_english.dct"
5-
#ifdefUSE_LOCALE
65
#include"dict/russian_stemming.dct"
7-
#endif
86

97
#undef TABLE_DICT_START
108
#undef TABLE_DICT_END

‎contrib/tsearch/morph.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,19 +104,15 @@ initmorph(void)
104104
k;
105105
MAPDICT*md;
106106
boolneedinit[lengthof(dicts)];
107-
108-
#ifdefUSE_LOCALE
109107
PG_LocaleCategorieslc;
110108

111109
intbylocaledict=NODICT;
112-
#endif
113110

114111
if (inited)
115112
return;
116113
for (i=1;i<lengthof(dicts);i++)
117114
needinit[i]= false;
118115

119-
#ifdefUSE_LOCALE
120116
PGLC_current(&lc);
121117
if (lc.lc_ctype )
122118
for (i=1;i<lengthof(dicts);i++)
@@ -126,7 +122,6 @@ initmorph(void)
126122
break;
127123
}
128124
PGLC_free_categories(&lc);
129-
#endif
130125

131126
for (i=1;i<lengthof(mapdict);i++)
132127
{
@@ -139,13 +134,9 @@ initmorph(void)
139134
break;
140135
elseif (GETDICT(md,k)==BYLOCALE)
141136
{
142-
#ifdefUSE_LOCALE
143137
if (bylocaledict==NODICT)
144138
continue;
145139
GETDICT(md,k)=bylocaledict;
146-
#else
147-
continue;
148-
#endif
149140
}
150141
if (GETDICT(md,k) >= (int2)lengthof(dicts))
151142
continue;

‎src/Makefile.global.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.153 2002/08/22 22:43:10 scrappy Exp $
2+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.154 2002/09/03 21:45:41 petere Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -127,7 +127,6 @@ with_perl= @with_perl@
127127
with_python= @with_python@
128128
with_tcl= @with_tcl@
129129
with_tk= @with_tk@
130-
MULTIBYTE= @MULTIBYTE@
131130
enable_shared= @enable_shared@
132131
enable_rpath= @enable_rpath@
133132
enable_nls= @enable_nls@

‎src/backend/commands/dbcommands.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.102 2002/09/02 02:47:01 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.103 2002/09/03 21:45:41 petere Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -591,7 +591,7 @@ get_db_info(const char *name, Oid *dbIdP, int4 *ownerIdP,
591591
/* sysid of the owner */
592592
if (ownerIdP)
593593
*ownerIdP=dbform->datdba;
594-
/*multibyte encoding */
594+
/*character encoding */
595595
if (encodingP)
596596
*encodingP=dbform->encoding;
597597
/* allowed as template? */

‎src/backend/libpq/pqcomm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
3030
* Portions Copyright (c) 1994, Regents of the University of California
3131
*
32-
*$Id: pqcomm.c,v 1.138 2002/09/02 02:47:02 momjian Exp $
32+
*$Id: pqcomm.c,v 1.139 2002/09/03 21:45:42 petere Exp $
3333
*
3434
*-------------------------------------------------------------------------
3535
*/
@@ -556,9 +556,9 @@ pq_getbytes(char *s, size_t len)
556556
*The return value is placed in an expansible StringInfo.
557557
*Note that space allocation comes from the current memory context!
558558
*
559-
*NOTE: this routine does not do anyMULTIBYTE conversion,
559+
*NOTE: this routine does not do anycharacter set conversion,
560560
*even though it is presumably useful only for text, because
561-
*no code in this module should depend onMULTIBYTE mode.
561+
*no code in this module should depend onthe encoding.
562562
*See pq_getstr in pqformat.c for that.
563563
*
564564
*returns 0 if OK, EOF if trouble

‎src/backend/libpq/pqformat.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
* formatting/conversion routines that are needed to produce valid messages.
99
* Note in particular the distinction between "raw data" and "text"; raw data
1010
* is message protocol characters and binary values that are not subject to
11-
*MULTIBYTEconversion, while text is converted byMULTIBYTE rules.
11+
*character setconversion, while text is converted bycharacter encoding rules.
1212
*
1313
* Incoming messages are read directly off the wire, as it were, but there
1414
* are still data-conversion tasks to be performed.
1515
*
1616
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
1717
* Portions Copyright (c) 1994, Regents of the University of California
1818
*
19-
*$Id: pqformat.c,v 1.23 2002/08/29 03:22:01 tgl Exp $
19+
*$Id: pqformat.c,v 1.24 2002/09/03 21:45:42 petere Exp $
2020
*
2121
*-------------------------------------------------------------------------
2222
*/
@@ -27,20 +27,20 @@
2727
*pq_sendbyte- append a raw byte to a StringInfo buffer
2828
*pq_sendint- append a binary integer to a StringInfo buffer
2929
*pq_sendbytes- append raw data to a StringInfo buffer
30-
*pq_sendcountedtext - append a text string (withMULTIBYTE conversion)
31-
*pq_sendstring- append a null-terminated text string (withMULTIBYTE)
30+
*pq_sendcountedtext - append a text string (withcharacter set conversion)
31+
*pq_sendstring- append a null-terminated text string (withconversion)
3232
*pq_endmessage- send the completed message to the frontend
3333
* Note: it is also possible to append data to the StringInfo buffer using
3434
* the regular StringInfo routines, but this is discouraged since required
35-
*MULTIBYTE conversion may not occur.
35+
*character set conversion may not occur.
3636
*
3737
* Special-case message output:
38-
*pq_puttextmessage - generate aMULTIBYTE-converted message in one step
38+
*pq_puttextmessage - generate acharacter set-converted message in one step
3939
*
4040
* Message input:
4141
*pq_getint- get an integer from connection
4242
*pq_getstr- get a null terminated string from connection
43-
* pq_getstr performsMULTIBYTE conversion on the collected string.
43+
* pq_getstr performscharacter set conversion on the collected string.
4444
* Use the raw pqcomm.c routines pq_getstring or pq_getbytes
4545
* to fetch data without conversion.
4646
*/
@@ -79,7 +79,7 @@ pq_sendbytes(StringInfo buf, const char *data, int datalen)
7979
}
8080

8181
/* --------------------------------
82-
*pq_sendcountedtext - append a text string (withMULTIBYTE conversion)
82+
*pq_sendcountedtext - append a text string (withcharacter set conversion)
8383
*
8484
* The data sent to the frontend by this routine is a 4-byte count field
8585
* (the count includes itself, by convention) followed by the string.
@@ -106,7 +106,7 @@ pq_sendcountedtext(StringInfo buf, const char *str, int slen)
106106
}
107107

108108
/* --------------------------------
109-
*pq_sendstring- append a null-terminated text string (withMULTIBYTE)
109+
*pq_sendstring- append a null-terminated text string (withconversion)
110110
*
111111
* NB: passed text string must be null-terminated, and so is the data
112112
* sent to the frontend.
@@ -178,10 +178,10 @@ pq_endmessage(StringInfo buf)
178178
}
179179

180180
/* --------------------------------
181-
*pq_puttextmessage - generate aMULTIBYTE-converted message in one step
181+
*pq_puttextmessage - generate acharacter set-converted message in one step
182182
*
183183
*This is the same as the pqcomm.c routine pq_putmessage, except that
184-
*the message body is a null-terminated string to whichMULTIBYTE
184+
*the message body is a null-terminated string to whichencoding
185185
*conversion applies.
186186
*
187187
*returns 0 if OK, EOF if trouble

‎src/backend/regex/Makefile

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for regex
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.17 2001/10/04 04:16:16 ishii Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.18 2002/09/03 21:45:42 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -14,13 +14,8 @@ include $(top_builddir)/src/Makefile.global
1414

1515
overrideCPPFLAGS += -DPOSIX_MISTAKE
1616

17-
DEBUGOBJ =
18-
1917
OBJS = regcomp.o regerror.o regexec.o regfree.o
20-
21-
ifdefMULTIBYTE
2218
DEBUGOBJ += ../utils/mb/SUBSYS.o
23-
endif
2419

2520
all: SUBSYS.o
2621

@@ -32,12 +27,5 @@ regexec.o: regexec.c engine.c
3227
retest: retest.o SUBSYS.o$(DEBUGOBJ)
3328
$(CC)$(CFLAGS)$(LDFLAGS)$^$(LIBS) -o$@
3429

35-
dependdep:
36-
$(CC) -MM$(CFLAGS)*.c>depend
37-
3830
clean:
3931
rm -f SUBSYS.o$(OBJS) retest retest.o
40-
41-
ifeq (depend,$(wildcard depend))
42-
include depend
43-
endif

‎src/backend/utils/Makefile

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
#
22
# Makefile for utils
33
#
4-
# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.19 2002/08/10 17:59:28 petere Exp $
4+
# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.20 2002/09/03 21:45:42 petere Exp $
55
#
66

77
subdir = src/backend/utils/
88
top_builddir = ../../..
99
include$(top_builddir)/src/Makefile.global
1010

11-
SUBDIRS := adt cache error fmgr hash init misc mmgr sort time
12-
ifdefMULTIBYTE
13-
SUBDIRS += mb
14-
endif
11+
SUBDIRS := adt cache error fmgr hash init misc mmgr sort time mb
1512
SUBDIROBJS :=$(SUBDIRS:%=%/SUBSYS.o)
1613

1714

@@ -33,10 +30,3 @@ fmgroids.h fmgrtab.c: Gen_fmgrtab.sh $(top_srcdir)/src/include/catalog/pg_proc.h
3330
clean:
3431
fordirin$(SUBDIRS);do$(MAKE) -C$$dir$@||exit;done
3532
rm -f SUBSYS.o fmgrtab.o fmgroids.h fmgrtab.c
36-
37-
depdepend: fmgroids.h fmgrtab.c
38-
fordirin$(SUBDIRS);do$(MAKE) -C$$dir$@||exit;done
39-
40-
ifeq (depend,$(wildcard depend))
41-
include depend
42-
endif

‎src/backend/utils/adt/cash.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* workings can be found in the book "Software Solutions in C" by
1010
* Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.
1111
*
12-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.54 2002/08/20 16:46:29 tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.55 2002/09/03 21:45:42 petere Exp $
1313
*/
1414

1515
#include"postgres.h"
@@ -61,7 +61,7 @@ CashGetDatum(Cash value)
6161
* XXX HACK It looks as though some of the symbols for
6262
*monetary values returned by localeconv() can be multiple
6363
*bytes/characters. This code assumes one byte only. - tgl 97/04/14
64-
* XXX UNHACK Allow the currency symbol to bemulti-byte.
64+
* XXX UNHACK Allow the currency symbol to bemultibyte.
6565
*- thomas 1998-03-01
6666
*/
6767
Datum

‎src/backend/utils/adt/like.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* Portions Copyright (c) 1994, Regents of the University of California
1212
*
1313
* IDENTIFICATION
14-
*$Header: /cvsroot/pgsql/src/backend/utils/adt/like.c,v 1.52 2002/09/02 06:22:19 momjian Exp $
14+
*$Header: /cvsroot/pgsql/src/backend/utils/adt/like.c,v 1.53 2002/09/03 21:45:42 petere Exp $
1515
*
1616
*-------------------------------------------------------------------------
1717
*/
@@ -93,7 +93,7 @@ iwchareq(unsigned char *p1, unsigned char *p2)
9393
return (0);
9494

9595
/*
96-
* ok, p1 and p2 are both > CHARMAX, then they must bemulti-byte
96+
* ok, p1 and p2 are both > CHARMAX, then they must bemultibyte
9797
* characters
9898
*/
9999
l=pg_mblen(p1);

‎src/backend/utils/adt/like_match.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
* like_match.c
44
* like expression handling internal code.
55
*
6-
* This file is included by like.c *twice* if multibyte is enabled.
7-
* This is for an optimization of single byte encodings.
6+
* This file is included by like.c *twice*, to provide an optimization
7+
* for single-byte encodings.
8+
*
89
* Before the inclusion, we need to define following macros:
910
*
1011
* CHAREQ
@@ -18,7 +19,7 @@
1819
* Copyright (c) 1996-2002, PostgreSQL Global Development Group
1920
*
2021
* IDENTIFICATION
21-
*$Header: /cvsroot/pgsql/src/backend/utils/adt/like_match.c,v 1.3 2002/06/20 20:29:37 momjian Exp $
22+
*$Header: /cvsroot/pgsql/src/backend/utils/adt/like_match.c,v 1.4 2002/09/03 21:45:42 petere Exp $
2223
*
2324
*-------------------------------------------------------------------------
2425
*/

‎src/backend/utils/adt/quote.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.8 2002/08/29 07:22:27 ishii Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.9 2002/09/03 21:45:42 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -64,13 +64,9 @@ quote_literal(PG_FUNCTION_ARGS)
6464
PG_RETURN_TEXT_P(result);
6565
}
6666

67-
6867
/*
69-
* MULTIBYTE dependant internal functions follow
70-
*
68+
* Check if a given identifier needs quoting
7169
*/
72-
73-
/* Check if a given identifier needs quoting (MULTIBYTE version) */
7470
staticbool
7571
quote_ident_required(text*iptr)
7672
{
@@ -106,7 +102,9 @@ quote_ident_required(text *iptr)
106102
return false;
107103
}
108104

109-
/* Return a properly quoted identifier (MULTIBYTE version) */
105+
/*
106+
* Return a properly quoted identifier
107+
*/
110108
statictext*
111109
do_quote_ident(text*iptr)
112110
{
@@ -147,7 +145,9 @@ do_quote_ident(text *iptr)
147145
returnresult;
148146
}
149147

150-
/* Return a properly quoted literal value (MULTIBYTE version) */
148+
/*
149+
* Return a properly quoted literal value
150+
*/
151151
statictext*
152152
do_quote_literal(text*lptr)
153153
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp