Remove all traces of multibyte and locale options. Clean up comments

referring to "multibyte" where it really means character encoding.

Author: petere

configure

@@ -1632,17 +1632,6 @@ echo "$as_me:$LINENO: result: $enable_recode" >&5
 echo "${ECHO_T}$enable_recode" >&6
 
 
-#
-# Multibyte support
-#
-MULTIBYTE=SQL_ASCII
-
-cat >>confdefs.h <<\_ACEOF
-#define MULTIBYTE 1
-_ACEOF
-
-
-
 #
 # NLS
 #
@@ -16275,7 +16264,6 @@ s,@host_vendor@,$host_vendor,;t t
 s,@host_os@,$host_os,;t t
 s,@PORTNAME@,$PORTNAME,;t t
 s,@TAS@,$TAS,;t t
-s,@MULTIBYTE@,$MULTIBYTE,;t t
 s,@enable_nls@,$enable_nls,;t t
 s,@WANTED_LANGUAGES@,$WANTED_LANGUAGES,;t t
 s,@default_port@,$default_port,;t t

configure.in

@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.201 2002/09/02 16:14:01 momjian Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.202 2002/09/03 21:45:41 petere Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -161,13 +161,6 @@ PGAC_ARG_BOOL(enable, recode, no, [  --enable-recode         enable character se
 AC_MSG_RESULT([$enable_recode])
 
 
-#
-# Multibyte support
-#
-MULTIBYTE=SQL_ASCII
-AC_DEFINE(MULTIBYTE, 1, [Set to 1 if you want to use multibyte characters (--enable-multibyte)])
-AC_SUBST(MULTIBYTE)
-
 #
 # NLS
 #

contrib/tsearch/dict.h

@@ -2,9 +2,7 @@
 #define TABLE_DICT_END		}
 
 #include "dict/porter_english.dct"
-#ifdef USE_LOCALE
 #include "dict/russian_stemming.dct"
-#endif
 
 #undef TABLE_DICT_START
 #undef TABLE_DICT_END

contrib/tsearch/morph.c

@@ -104,19 +104,15 @@ initmorph(void)
 				k;
 	MAPDICT    *md;
 	bool		needinit[lengthof(dicts)];
-
-#ifdef USE_LOCALE
 	PG_LocaleCategories lc;
 
 	int			bylocaledict = NODICT;
-#endif
 
 	if (inited)
 		return;
 	for (i = 1; i < lengthof(dicts); i++)
 		needinit[i] = false;
 
-#ifdef USE_LOCALE
 	PGLC_current(&lc);
 	if ( lc.lc_ctype )
 		for (i = 1; i < lengthof(dicts); i++)
@@ -126,7 +122,6 @@ initmorph(void)
 				break;
 			}
 	PGLC_free_categories(&lc);
-#endif
 
 	for (i = 1; i < lengthof(mapdict); i++)
 	{
@@ -139,13 +134,9 @@ initmorph(void)
 				break;
 			else if (GETDICT(md, k) == BYLOCALE)
 			{
-#ifdef USE_LOCALE
 				if (bylocaledict == NODICT)
 					continue;
 				GETDICT(md, k) = bylocaledict;
-#else
-				continue;
-#endif
 			}
 			if (GETDICT(md, k) >= (int2) lengthof(dicts))
 				continue;

src/Makefile.global.in

@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.153 2002/08/22 22:43:10 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.154 2002/09/03 21:45:41 petere Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -127,7 +127,6 @@ with_perl	= @with_perl@
 with_python	= @with_python@
 with_tcl	= @with_tcl@
 with_tk		= @with_tk@
-MULTIBYTE	= @MULTIBYTE@
 enable_shared	= @enable_shared@
 enable_rpath	= @enable_rpath@
 enable_nls	= @enable_nls@

src/backend/commands/dbcommands.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.102 2002/09/02 02:47:01 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.103 2002/09/03 21:45:41 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -591,7 +591,7 @@ get_db_info(const char *name, Oid *dbIdP, int4 *ownerIdP,
 		/* sysid of the owner */
 		if (ownerIdP)
 			*ownerIdP = dbform->datdba;
-		/* multibyte encoding */
+		/* character encoding */
 		if (encodingP)
 			*encodingP = dbform->encoding;
 		/* allowed as template? */

src/backend/libpq/pqcomm.c

@@ -29,7 +29,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqcomm.c,v 1.138 2002/09/02 02:47:02 momjian Exp $
+ *	$Id: pqcomm.c,v 1.139 2002/09/03 21:45:42 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -556,9 +556,9 @@ pq_getbytes(char *s, size_t len)
  *		The return value is placed in an expansible StringInfo.
  *		Note that space allocation comes from the current memory context!
  *
- *		NOTE: this routine does not do any MULTIBYTE conversion,
+ *		NOTE: this routine does not do any character set conversion,
  *		even though it is presumably useful only for text, because
- *		no code in this module should depend on MULTIBYTE mode.
+ *		no code in this module should depend on the encoding.
  *		See pq_getstr in pqformat.c for that.
  *
  *		returns 0 if OK, EOF if trouble

src/backend/libpq/pqformat.c

@@ -8,15 +8,15 @@
  * formatting/conversion routines that are needed to produce valid messages.
  * Note in particular the distinction between "raw data" and "text"; raw data
  * is message protocol characters and binary values that are not subject to
- * MULTIBYTE conversion, while text is converted by MULTIBYTE rules.
+ * character set conversion, while text is converted by character encoding rules.
  *
  * Incoming messages are read directly off the wire, as it were, but there
  * are still data-conversion tasks to be performed.
  *
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$Id: pqformat.c,v 1.23 2002/08/29 03:22:01 tgl Exp $
+ *	$Id: pqformat.c,v 1.24 2002/09/03 21:45:42 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -27,20 +27,20 @@
  *		pq_sendbyte		- append a raw byte to a StringInfo buffer
  *		pq_sendint		- append a binary integer to a StringInfo buffer
  *		pq_sendbytes	- append raw data to a StringInfo buffer
- *		pq_sendcountedtext - append a text string (with MULTIBYTE conversion)
- *		pq_sendstring	- append a null-terminated text string (with MULTIBYTE)
+ *		pq_sendcountedtext - append a text string (with character set conversion)
+ *		pq_sendstring	- append a null-terminated text string (with conversion)
  *		pq_endmessage	- send the completed message to the frontend
  * Note: it is also possible to append data to the StringInfo buffer using
  * the regular StringInfo routines, but this is discouraged since required
- * MULTIBYTE conversion may not occur.
+ * character set conversion may not occur.
  *
  * Special-case message output:
- *		pq_puttextmessage - generate a MULTIBYTE-converted message in one step
+ *		pq_puttextmessage - generate a character set-converted message in one step
  *
  * Message input:
  *		pq_getint		- get an integer from connection
  *		pq_getstr		- get a null terminated string from connection
- * pq_getstr performs MULTIBYTE conversion on the collected string.
+ * pq_getstr performs character set conversion on the collected string.
  * Use the raw pqcomm.c routines pq_getstring or pq_getbytes
  * to fetch data without conversion.
  */
@@ -79,7 +79,7 @@ pq_sendbytes(StringInfo buf, const char *data, int datalen)
 }
 
 /* --------------------------------
- *		pq_sendcountedtext - append a text string (with MULTIBYTE conversion)
+ *		pq_sendcountedtext - append a text string (with character set conversion)
  *
  * The data sent to the frontend by this routine is a 4-byte count field
  * (the count includes itself, by convention) followed by the string.
@@ -106,7 +106,7 @@ pq_sendcountedtext(StringInfo buf, const char *str, int slen)
 }
 
 /* --------------------------------
- *		pq_sendstring	- append a null-terminated text string (with MULTIBYTE)
+ *		pq_sendstring	- append a null-terminated text string (with conversion)
  *
  * NB: passed text string must be null-terminated, and so is the data
  * sent to the frontend.
@@ -178,10 +178,10 @@ pq_endmessage(StringInfo buf)
 }
 
 /* --------------------------------
- *		pq_puttextmessage - generate a MULTIBYTE-converted message in one step
+ *		pq_puttextmessage - generate a character set-converted message in one step
  *
  *		This is the same as the pqcomm.c routine pq_putmessage, except that
- *		the message body is a null-terminated string to which MULTIBYTE
+ *		the message body is a null-terminated string to which encoding
  *		conversion applies.
  *
  *		returns 0 if OK, EOF if trouble

src/backend/regex/Makefile

@@ -4,7 +4,7 @@
 #    Makefile for regex
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.17 2001/10/04 04:16:16 ishii Exp $
+#    $Header: /cvsroot/pgsql/src/backend/regex/Makefile,v 1.18 2002/09/03 21:45:42 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,13 +14,8 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS += -DPOSIX_MISTAKE 
 
-DEBUGOBJ =
-
 OBJS = regcomp.o regerror.o regexec.o regfree.o
-
-ifdef MULTIBYTE
 DEBUGOBJ += ../utils/mb/SUBSYS.o
-endif
 
 all: SUBSYS.o
 
@@ -32,12 +27,5 @@ regexec.o: regexec.c engine.c
 retest: retest.o SUBSYS.o $(DEBUGOBJ)
 	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
 
-depend dep:
-	$(CC) -MM $(CFLAGS) *.c >depend
-
 clean: 
 	rm -f SUBSYS.o $(OBJS) retest retest.o
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif

src/backend/utils/Makefile

@@ -1,17 +1,14 @@
 #
 # Makefile for utils
 #
-# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.19 2002/08/10 17:59:28 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.20 2002/09/03 21:45:42 petere Exp $
 #
 
 subdir = src/backend/utils/
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-SUBDIRS     := adt cache error fmgr hash init misc mmgr sort time
-ifdef MULTIBYTE
-SUBDIRS     += mb
-endif
+SUBDIRS     := adt cache error fmgr hash init misc mmgr sort time mb
 SUBDIROBJS  := $(SUBDIRS:%=%/SUBSYS.o)
 
 
@@ -33,10 +30,3 @@ fmgroids.h fmgrtab.c: Gen_fmgrtab.sh $(top_srcdir)/src/include/catalog/pg_proc.h
 clean:
 	for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done
 	rm -f SUBSYS.o fmgrtab.o fmgroids.h fmgrtab.c
-
-dep depend: fmgroids.h fmgrtab.c
-	for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done
-
-ifeq (depend,$(wildcard depend))
-include depend
-endif

src/backend/utils/adt/cash.c

@@ -9,7 +9,7 @@
  * workings can be found in the book "Software Solutions in C" by
  * Dale Schumacher, Academic Press, ISBN: 0-12-632360-7.
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.54 2002/08/20 16:46:29 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/cash.c,v 1.55 2002/09/03 21:45:42 petere Exp $
  */
 
 #include "postgres.h"
@@ -61,7 +61,7 @@ CashGetDatum(Cash value)
  * XXX HACK It looks as though some of the symbols for
  *	monetary values returned by localeconv() can be multiple
  *	bytes/characters. This code assumes one byte only. - tgl 97/04/14
- * XXX UNHACK Allow the currency symbol to be multi-byte.
+ * XXX UNHACK Allow the currency symbol to be multibyte.
  *	- thomas 1998-03-01
  */
 Datum

src/backend/utils/adt/like.c

@@ -11,7 +11,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	$Header: /cvsroot/pgsql/src/backend/utils/adt/like.c,v 1.52 2002/09/02 06:22:19 momjian Exp $
+ *	$Header: /cvsroot/pgsql/src/backend/utils/adt/like.c,v 1.53 2002/09/03 21:45:42 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -93,7 +93,7 @@ iwchareq(unsigned char *p1, unsigned char *p2)
 		return (0);
 
 	/*
-	 * ok, p1 and p2 are both > CHARMAX, then they must be multi-byte
+	 * ok, p1 and p2 are both > CHARMAX, then they must be multibyte
 	 * characters
 	 */
 	l = pg_mblen(p1);

src/backend/utils/adt/like_match.c

@@ -3,8 +3,9 @@
  * like_match.c
  *	  like expression handling internal code.
  *
- * This file is included by like.c *twice* if multibyte is enabled.
- * This is for an optimization of single byte encodings.
+ * This file is included by like.c *twice*, to provide an optimization
+ * for single-byte encodings.
+ *
  * Before the inclusion, we need to define following macros:
  *
  * CHAREQ
@@ -18,7 +19,7 @@
  * Copyright (c) 1996-2002, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	$Header: /cvsroot/pgsql/src/backend/utils/adt/like_match.c,v 1.3 2002/06/20 20:29:37 momjian Exp $
+ *	$Header: /cvsroot/pgsql/src/backend/utils/adt/like_match.c,v 1.4 2002/09/03 21:45:42 petere Exp $
  *
  *-------------------------------------------------------------------------
  */

src/backend/utils/adt/quote.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.8 2002/08/29 07:22:27 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.9 2002/09/03 21:45:42 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,13 +64,9 @@ quote_literal(PG_FUNCTION_ARGS)
 	PG_RETURN_TEXT_P(result);
 }
 
-
 /*
- * MULTIBYTE dependant internal functions follow
- *
+ * Check if a given identifier needs quoting
  */
-
-/* Check if a given identifier needs quoting (MULTIBYTE version) */
 static bool
 quote_ident_required(text *iptr)
 {
@@ -106,7 +102,9 @@ quote_ident_required(text *iptr)
 	return false;
 }
 
-/* Return a properly quoted identifier (MULTIBYTE version) */
+/*
+ * Return a properly quoted identifier
+ */
 static text *
 do_quote_ident(text *iptr)
 {
@@ -147,7 +145,9 @@ do_quote_ident(text *iptr)
 	return result;
 }
 
-/* Return a properly quoted literal value (MULTIBYTE version) */
+/*
+ * Return a properly quoted literal value
+ */
 static text *
 do_quote_literal(text *lptr)
 {