diff options
Diffstat (limited to 'wctype/wctrans_l.c')
| -rw-r--r-- | wctype/wctrans_l.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/wctype/wctrans_l.c b/wctype/wctrans_l.c index 3b8b6050b5..94e2451926 100644 --- a/wctype/wctrans_l.c +++ b/wctype/wctrans_l.c @@ -25,6 +25,7 @@ __wctrans_l (const char *property, __locale_t locale) { const char *names; size_t cnt; + size_t i; names = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_NAMES)].string; cnt = 0; @@ -40,21 +41,6 @@ __wctrans_l (const char *property, __locale_t locale) if (names[0] == '\0') return 0; - if (locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_HASH_SIZE)].word == 0) - { - /* Old locale format. */ - if (cnt == __TOW_toupper) - return (wctrans_t) locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_TOUPPER32)].string; - else if (cnt == __TOW_tolower) - return (wctrans_t) locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_TOLOWER32)].string; - - /* We have to search the table. */ - return (wctrans_t) (const int32_t *) locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_NUM_LC_CTYPE + cnt - 2)].string; - } - else - { - /* New locale format. */ - size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + cnt; - return (wctrans_t) locale->__locales[LC_CTYPE]->values[i].string; - } + i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + cnt; + return (wctrans_t) locale->__locales[LC_CTYPE]->values[i].string; } |