1 files changed, 4 insertions, 73 deletions

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 9301d1b1cfb..8829c69e32b 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.176 2001/08/21 20:39:52 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.177 2001/09/06 04:57:30 ishii Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1659,7 +1659,7 @@ keep_going:						/* We will come back to here until there
 					/* set client encoding in pg_conn struct */
 					encoding = PQgetvalue(res, 0, 0);
 					if (!encoding)		/* this should not happen */
-						conn->client_encoding = SQL_ASCII;
+						conn->client_encoding = PG_SQL_ASCII;
 					else
 						conn->client_encoding = pg_char_to_encoding(encoding);
 					PQclear(res);
@@ -2758,7 +2758,8 @@ PQsetClientEncoding(PGconn *conn, const char *encoding)
 	return (status);
 }
 
-#else
+#else	/* without multibytle support */
+
 int
 PQsetClientEncoding(PGconn *conn, const char *encoding)
 {
@@ -2832,73 +2833,3 @@ defaultNoticeProcessor(void *arg, const char *message)
 	/* Note: we expect the supplied string to end with a newline already. */
 	fprintf(stderr, "%s", message);
 }
-
-#ifdef MULTIBYTE
-/*
- * convert an encoding string to encoding symbol value.
- * case is ignored.
- * if there's no valid encoding, returns -1
- */
-
-typedef struct
-{
-	int			encoding;		/* encoding symbol value */
-	char	   *name;			/* encoding string */
-}			PQ_encoding_conv_tbl;
-
-static PQ_encoding_conv_tbl pq_conv_tbl[] = {
-	{SQL_ASCII, "SQL_ASCII"},
-	{EUC_JP, "EUC_JP"},
-	{EUC_CN, "EUC_CN"},
-	{EUC_KR, "EUC_KR"},
-	{EUC_TW, "EUC_TW"},
-	{UNICODE, "UNICODE"},
-	{MULE_INTERNAL, "MULE_INTERNAL"},
-	{LATIN1, "LATIN1"},
-	{LATIN2, "LATIN2"},
-	{LATIN3, "LATIN3"},
-	{LATIN4, "LATIN4"},
-	{LATIN5, "LATIN5"},
-	{KOI8, "KOI8"},
-	{WIN, "WIN"},
-	{ALT, "ALT"},
-	{SJIS, "SJIS"},
-	{BIG5, "BIG5"},
-	{WIN1250, "WIN1250"},
-	{-1, ""}
-};
-
-int
-pg_char_to_encoding(const char *s)
-{
-	PQ_encoding_conv_tbl *p = pq_conv_tbl;
-
-	if (!s)
-		return (-1);
-
-	for (; p->encoding >= 0; p++)
-	{
-		if (!strcasecmp(s, p->name))
-			break;
-	}
-	return (p->encoding);
-}
-
-/*
- * convert encoding symbol to encoding char.
- * if there's no valid encoding symbol, returns ""
- */
-const char *
-pg_encoding_to_char(int encoding)
-{
-	PQ_encoding_conv_tbl *p = pq_conv_tbl;
-
-	for (; p->encoding >= 0; p++)
-	{
-		if (p->encoding == encoding)
-			return (p->name);
-	}
-	return ("");
-}
-
-#endif