From 3d7a9ac76977959eabf4bbbc675fb0e153b36aa2 Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii@postgresql.org>
Date: Thu, 18 Jul 2002 04:16:07 +0000
Subject: [PATCH] Fix breakage for pltcl modules. pg_get_enconv_by_encoding()
has been changed since CREATE CONVERSION supported.
---
src/pl/tcl/pltcl.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index 9e67e913ea4..f70751d23f6 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -31,7 +31,7 @@
* ENHANCEMENTS, OR MODIFICATIONS.
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.56 2002/06/15 19:54:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/pl/tcl/pltcl.c,v 1.57 2002/07/18 04:16:07 ishii Exp $
*
**********************************************************************/
@@ -65,20 +65,16 @@
#include "mb/pg_wchar.h"
-static pg_enconv *tcl_enconv;
-
static unsigned char *
utf_u2e(unsigned char *src)
{
- return pg_do_encoding_conversion(src, strlen(src),
- NULL, tcl_enconv->from_unicode);
+ return pg_do_encoding_conversion(src, strlen(src), PG_UNICODE, GetDatabaseEncoding());
}
static unsigned char *
utf_e2u(unsigned char *src)
{
- return pg_do_encoding_conversion(src, strlen(src),
- tcl_enconv->to_unicode, NULL);
+ return pg_do_encoding_conversion(src, strlen(src), GetDatabaseEncoding(), PG_UNICODE);
}
#define PLTCL_UTF
@@ -211,14 +207,6 @@ pltcl_init_all(void)
if (!pltcl_firstcall)
return;
-#ifdef PLTCL_UTF
- /************************************************************
- * Do unicode conversion initialization
- ************************************************************/
-
- tcl_enconv = pg_get_enconv_by_encoding(GetDatabaseEncoding());
-#endif
-
/************************************************************
* Create the dummy hold interpreter to prevent close of
* stdout and stderr on DeleteInterp
--
GitLab