diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-10 14:22:54 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-10 14:22:54 +0200 |
| commit | 668c627eb4e66208738d5acdecbcad106efa8252 (patch) | |
| tree | 3a1bc6bf47823c21ec11204c9eb507887f068409 /sal/osl | |
| parent | 5c79177089cd4038276f63577affa7c86dcaab38 (diff) | |
Remove support for undocumented SOLAR_USER_RTL_TEXTENCODING env var
...introduced in 2001 with a Sun-internal bug ID as
3b1d10acc297db493b1f4e1999f6ba71f72db7f1 and
54007bb90c30469a5357c56056b8fdba3a233e24 "#84715# osl_getThreadTextEncoding
first defaults to contents of environment variable SOLAR_USER_RTL_TEXTENCODING."
Change-Id: I991b4777c27a24419bf066cf41b3c4545d0fa681
Diffstat (limited to 'sal/osl')
| -rw-r--r-- | sal/osl/unx/thread.c | 10 | ||||
| -rw-r--r-- | sal/osl/w32/thread.c | 9 |
2 files changed, 2 insertions, 17 deletions
diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c index 598fd92c9b7b..3b09d3f65f8f 100644 --- a/sal/osl/unx/thread.c +++ b/sal/osl/unx/thread.c @@ -951,19 +951,11 @@ sal_Bool SAL_CALL osl_setThreadKeyData(oslThreadKey Key, void *pData) /*****************************************************************************/ static void osl_thread_textencoding_init_Impl (void) { - rtl_TextEncoding defaultEncoding; - const char * pszEncoding; - /* create thread specific data key */ pthread_key_create (&(g_thread.m_textencoding.m_key), NULL); /* determine default text encoding */ - pszEncoding = getenv ("SOLAR_USER_RTL_TEXTENCODING"); - if (pszEncoding) - defaultEncoding = atoi(pszEncoding); - else - defaultEncoding = osl_getTextEncodingFromLocale(NULL); - + rtl_TextEncoding defaultEncoding = osl_getTextEncodingFromLocale(NULL); OSL_ASSERT(defaultEncoding != RTL_TEXTENCODING_DONTKNOW); /* diff --git a/sal/osl/w32/thread.c b/sal/osl/w32/thread.c index d4dbc7f8f9f9..0bb71722694f 100644 --- a/sal/osl/w32/thread.c +++ b/sal/osl/w32/thread.c @@ -576,16 +576,9 @@ rtl_TextEncoding SAL_CALL osl_getThreadTextEncoding(void) _encoding = LOWORD(dwEncoding); gotACP = HIWORD(dwEncoding); - if ( !gotACP ) { - char *pszEncoding; - - if ( NULL != (pszEncoding = getenv( "SOLAR_USER_RTL_TEXTENCODING" )) ) - _encoding = (rtl_TextEncoding)atoi(pszEncoding); - else - _encoding = rtl_getTextEncodingFromWindowsCodePage( GetACP() ); - + _encoding = rtl_getTextEncodingFromWindowsCodePage( GetACP() ); TlsSetValue( g_dwTLSTextEncodingIndex, (LPVOID)(DWORD_PTR)MAKELONG( _encoding, TRUE ) ); } |