33 * client encoding and server internal encoding.
44 * (currently mule internal code (mic) is used)
55 * Tatsuo Ishii
6- * $Id: mbutils.c,v 1.21 2001/09/08 14:30:15 momjian Exp $
6+ * $Id: mbutils.c,v 1.22 2001/09/09 01:15:11 ishii Exp $
77 */
88#include "postgres.h"
99
2121 *
2222 * Karel Zak (Aug 2001)
2323 */
24- static pg_enc2name * ClientEncoding = NULL ;
24+ static pg_enc2name * ClientEncoding = & pg_enc2name_tbl [ PG_SQL_ASCII ] ;
2525static pg_enc2name * DatabaseEncoding = & pg_enc2name_tbl [PG_SQL_ASCII ];
2626
2727static void (* client_to_mic ) ();/* something to MIC */
@@ -134,12 +134,7 @@ pg_set_client_encoding(int encoding)
134134int
135135pg_get_client_encoding ()
136136{
137- Assert (DatabaseEncoding );
138-
139- if (ClientEncoding == NULL )
140- /* this is the first time */
141- ClientEncoding = DatabaseEncoding ;
142-
137+ Assert (ClientEncoding );
143138return (ClientEncoding -> encoding );
144139}
145140
@@ -149,12 +144,7 @@ pg_get_client_encoding()
149144const char *
150145pg_get_client_encoding_name ()
151146{
152- Assert (DatabaseEncoding );
153-
154- if (ClientEncoding == NULL )
155- /* this is the first time */
156- ClientEncoding = DatabaseEncoding ;
157-
147+ Assert (ClientEncoding );
158148return (ClientEncoding -> name );
159149}
160150
@@ -310,10 +300,7 @@ unsigned char *
310300pg_client_to_server (unsignedchar * s ,int len )
311301{
312302Assert (DatabaseEncoding );
313-
314- if (ClientEncoding == NULL )
315- /* this is the first time */
316- ClientEncoding = DatabaseEncoding ;
303+ Assert (ClientEncoding );
317304
318305if (ClientEncoding -> encoding == DatabaseEncoding -> encoding )
319306return s ;
@@ -338,10 +325,7 @@ unsigned char *
338325pg_server_to_client (unsignedchar * s ,int len )
339326{
340327Assert (DatabaseEncoding );
341-
342- if (ClientEncoding == NULL )
343- /* this is the first time */
344- ClientEncoding = DatabaseEncoding ;
328+ Assert (ClientEncoding );
345329
346330if (ClientEncoding -> encoding == DatabaseEncoding -> encoding )
347331return s ;