diff options
Diffstat (limited to 'src/backend/utils/mb/variable.c')
| -rw-r--r-- | src/backend/utils/mb/variable.c | 70 |
1 files changed, 36 insertions, 34 deletions
diff --git a/src/backend/utils/mb/variable.c b/src/backend/utils/mb/variable.c index 12cc23d3f30..37b95ccf120 100644 --- a/src/backend/utils/mb/variable.c +++ b/src/backend/utils/mb/variable.c @@ -2,7 +2,7 @@ * This file contains some public functions * related to show/set/reset variable commands. * Tatsuo Ishii - * $Id: variable.c,v 1.1 1998/07/24 03:31:57 scrappy Exp $ + * $Id: variable.c,v 1.2 1998/09/01 04:33:24 momjian Exp $ */ #include "mb/pg_wchar.h" @@ -10,64 +10,66 @@ bool parse_client_encoding(const char *value) { - int encoding; + int encoding; - encoding = pg_valid_client_encoding(value); - if (encoding < 0) { - elog(ERROR, "Client encoding %s is not supported", value); - } else { - if (pg_set_client_encoding(encoding)) { - elog(ERROR, "Conversion between %s and %s is not supported", - value, pg_encoding_to_char(GetDatabaseEncoding())); - } - } - return TRUE; + encoding = pg_valid_client_encoding(value); + if (encoding < 0) + elog(ERROR, "Client encoding %s is not supported", value); + else + { + if (pg_set_client_encoding(encoding)) + { + elog(ERROR, "Conversion between %s and %s is not supported", + value, pg_encoding_to_char(GetDatabaseEncoding())); + } + } + return TRUE; } bool show_client_encoding() { - elog(NOTICE, "Current client encoding is %s", - pg_encoding_to_char(pg_get_client_encoding())); - return TRUE; + elog(NOTICE, "Current client encoding is %s", + pg_encoding_to_char(pg_get_client_encoding())); + return TRUE; } bool reset_client_encoding() { - int encoding; - char *env = getenv("PGCLIENTENCODING"); + int encoding; + char *env = getenv("PGCLIENTENCODING"); - if (env) { - encoding = pg_char_to_encoding(env); - if (encoding < 0) { - encoding = GetDatabaseEncoding(); - } - } else { - encoding = GetDatabaseEncoding(); - } - pg_set_client_encoding(encoding); - return TRUE; + if (env) + { + encoding = pg_char_to_encoding(env); + if (encoding < 0) + encoding = GetDatabaseEncoding(); + } + else + encoding = GetDatabaseEncoding(); + pg_set_client_encoding(encoding); + return TRUE; } bool parse_server_encoding(const char *value) { - elog(NOTICE, "SET SERVER_ENCODING is not supported"); - return TRUE; + elog(NOTICE, "SET SERVER_ENCODING is not supported"); + return TRUE; } bool show_server_encoding() { - elog(NOTICE, "Current server encoding is %s", - pg_encoding_to_char(GetDatabaseEncoding())); - return TRUE; + elog(NOTICE, "Current server encoding is %s", + pg_encoding_to_char(GetDatabaseEncoding())); + return TRUE; } bool reset_server_encoding() { - elog(NOTICE, "RESET SERVER_ENCODING is not supported"); - return TRUE; + elog(NOTICE, "RESET SERVER_ENCODING is not supported"); + return TRUE; } |