diff options
Diffstat (limited to 'wctype/wcfuncs_l.c')
| -rw-r--r-- | wctype/wcfuncs_l.c | 79 |
1 files changed, 11 insertions, 68 deletions
diff --git a/wctype/wcfuncs_l.c b/wctype/wcfuncs_l.c index 5ef543cc47..a552895316 100644 --- a/wctype/wcfuncs_l.c +++ b/wctype/wcfuncs_l.c @@ -16,12 +16,11 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define __NO_WCTYPE #include <wctype.h> #include <stdint.h> +#include <locale/localeinfo.h> #define USE_IN_EXTENDED_LOCALE_MODEL -#include "cname-lookup.h" #include "wchar-lookup.h" /* Provide real-function versions of all the wctype macros. */ @@ -29,32 +28,14 @@ #define func(name, type) \ int name (wint_t wc, __locale_t locale) \ { \ - if (locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_HASH_SIZE)].word != 0) \ - { \ - /* Old locale format. */ \ - const uint32_t *class32_b; \ - size_t idx; \ - \ - idx = cname_lookup (wc, locale); \ - if (idx == ~((size_t) 0)) \ - return 0; \ - \ - class32_b = (uint32_t *) \ - locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_CLASS32)].string; \ - \ - return class32_b[idx] & _ISwbit (type); \ - } \ - else \ - { \ - /* New locale format. */ \ - size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_CLASS_OFFSET)].word + type; \ - const char *desc = locale->__locales[LC_CTYPE]->values[i].string; \ - return wctype_table_lookup (desc, wc); \ - } \ + size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_CLASS_OFFSET)].word + type; \ + const char *desc = locale->__locales[LC_CTYPE]->values[i].string; \ + return wctype_table_lookup (desc, wc); \ } func (__iswalnum_l, __ISwalnum) func (__iswalpha_l, __ISwalpha) +func (__iswblank_l, __ISwblank) func (__iswcntrl_l, __ISwcntrl) func (__iswdigit_l, __ISwdigit) func (__iswlower_l, __ISwlower) @@ -68,53 +49,15 @@ func (__iswxdigit_l, __ISwxdigit) wint_t (__towlower_l) (wint_t wc, __locale_t locale) { - if (locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_HASH_SIZE)].word != 0) - { - /* Old locale format. */ - const int32_t *class32_tolower; - size_t idx; - - idx = cname_lookup (wc, locale); - if (idx == ~((size_t) 0)) - return 0; - - class32_tolower = (const int32_t *) - locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_TOLOWER32)].string; - - return class32_tolower[idx]; - } - else - { - /* New locale format. */ - size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + __TOW_tolower; - const char *desc = locale->__locales[LC_CTYPE]->values[i].string; - return wctrans_table_lookup (desc, wc); - } + size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + __TOW_tolower; + const char *desc = locale->__locales[LC_CTYPE]->values[i].string; + return wctrans_table_lookup (desc, wc); } wint_t (__towupper_l) (wint_t wc, __locale_t locale) { - if (locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_HASH_SIZE)].word != 0) - { - /* Old locale format. */ - const int32_t *class32_toupper; - size_t idx; - - idx = cname_lookup (wc, locale); - if (idx == ~((size_t) 0)) - return 0; - - class32_toupper = (const int32_t *) - locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_TOUPPER32)].string; - - return class32_toupper[idx]; - } - else - { - /* New locale format. */ - size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + __TOW_toupper; - const char *desc = locale->__locales[LC_CTYPE]->values[i].string; - return wctrans_table_lookup (desc, wc); - } + size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + __TOW_toupper; + const char *desc = locale->__locales[LC_CTYPE]->values[i].string; + return wctrans_table_lookup (desc, wc); } |