diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2016-08-20 17:05:56 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2016-08-20 18:14:56 +0300 |
| commit | 7630e384623f778b88be8926e2c2a2e6fcbd9008 (patch) | |
| tree | 7a3efa5017679ab797cf264b9290ebd281cd0ddc /newlib/libc/ctype | |
| parent | 06ac6718119dfd382c1904b1162f6cd7f9749dc3 (diff) | |
Introduce __current_locale_charset/__locale_charset
The former __locale_charset always fetched the current locale's charset.
We need the per-locale charset, too, in future. Rename __locale_charset
to __current_locale_charset and change __locale_charset to take a
locale_t as parameter. Accommodate througout.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'newlib/libc/ctype')
| -rw-r--r-- | newlib/libc/ctype/jp2uc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/newlib/libc/ctype/jp2uc.c b/newlib/libc/ctype/jp2uc.c index 40d777add..f5bd7dbf2 100644 --- a/newlib/libc/ctype/jp2uc.c +++ b/newlib/libc/ctype/jp2uc.c @@ -154,11 +154,11 @@ _DEFUN (__jp2uc, (c, type), wint_t c _AND int type) wint_t _DEFUN (_jp2uc, (c), wint_t c) { - if (!strcmp (__locale_charset (), "JIS")) + if (!strcmp (__current_locale_charset (), "JIS")) c = __jp2uc (c, JP_JIS); - else if (!strcmp (__locale_charset (), "SJIS")) + else if (!strcmp (__current_locale_charset (), "SJIS")) c = __jp2uc (c, JP_SJIS); - else if (!strcmp (__locale_charset (), "EUCJP")) + else if (!strcmp (__current_locale_charset (), "EUCJP")) c = __jp2uc (c, JP_EUCJP); return c; } |