index 590c7702e7b2b28b15037bbbf179bc4c947aac54..4be735e918d7e0e9558a6c47aff446fb03c2ad96 100644 (file)
#include "catalog/pg_collation.h"
#include "catalog/pg_control.h"
#include "mb/pg_wchar.h"
-#include "utils/builtins.h"
#include "utils/hsearch.h"
#include "utils/memutils.h"
#include "utils/pg_locale.h"
@@ -149,7 +148,6 @@ pg_perm_setlocale(int category, const char *locale)
char *result;
const char *envvar;
char *envbuf;
- char orig_result[LC_ENV_BUFSIZE];
#ifndef WIN32
result = setlocale(category, locale);
@@ -175,7 +173,6 @@ pg_perm_setlocale(int category, const char *locale)
if (result == NULL)
return result; /* fall out immediately on failure */
- strlcpy(orig_result, result, sizeof(orig_result));
/*
* Use the right encoding in translated messages. Under ENABLE_NLS, let
@@ -234,17 +231,6 @@ pg_perm_setlocale(int category, const char *locale)
}
snprintf(envbuf, LC_ENV_BUFSIZE - 1, "%s=%s", envvar, result);
- if (strcmp(orig_result, result) != 0)
- {
- char hex[2 * LC_ENV_BUFSIZE + 1];
- unsigned hexlen;
-
- hexlen =
- hex_encode(result, Min(1 + strlen(result), LC_ENV_BUFSIZE), hex);
- hex[hexlen] = '0円';
- elog(FATAL, "setlocale() result %s clobbered to 0x%s",
- orig_result, hex);
- }
if (putenv(envbuf))
return NULL;