diff options
| author | Roland McGrath <roland@gnu.org> | 2002-09-02 19:34:39 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-09-02 19:34:39 +0000 |
| commit | 963102971df9fbcd967a46748efc854d269cee1f (patch) | |
| tree | 352ea540316cec578b89ff90b8d9915536906870 /wcsmbs/mbsrtowcs_l.c | |
| parent | 1977e59058a8a5260770cade67676bd93f896fdf (diff) | |
| download | glibc-963102971df9fbcd967a46748efc854d269cee1f.zip glibc-963102971df9fbcd967a46748efc854d269cee1f.tar.gz glibc-963102971df9fbcd967a46748efc854d269cee1f.tar.bz2 | |
* locale/localeinfo.h (struct locale_data): Add private.ctype.
* wcsmbs/wcsmbsload.h (__wcsmbs_gconv_fcts, __wcsmbs_last_locale,
__wcsmbs_to_wc, update_conversion_ptrs): Removed.
(__wcsmbs_gconv_fcts_c, _nl_C_LC_CTYPE): New externs.
(__wcsmbs_load_conv): Remove const from argument.
(_nl_cleanup_ctype): New proto.
(get_gconv_fcts): New function.
* wcsmbs/wcsmbsload.c (__wcsmbs_last_locale): Removed.
(__wcsmbs_to_wc): Rename back to...
(to_wc): ... this.
(__wcsmbs_gconv_fcts): Rename to...
(__wcsmbs_gconv_fcts_c): ... this. Make const. Use to_wc.
(lock): Removed.
(__libc_setlocale_lock): New extern.
(__wcsmbs_load_conv): Remove const from argument.
Initialize new_category->private.ctype instead of a global
variable.
(__wcsmbs_clone_conv): Use get_gconv_fcts instead of
update_function_ptrs. No locking is necessary.
(_nl_cleanup_ctype): New function.
* wcsmbs/btowc.c (__btowc): Use get_gconv_fcts instead of
update_function_ptrs and a global __wcsmbs_gconv_fcts variable.
* wcsmbs/mbrtowc.c (__mbrtowc): Likewise.
* wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
* wcsmbs/wcrtomb.c (__wcrtomb): Likewise.
* wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
* wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
* wcsmbs/wctob.c (wctob): Likewise.
* stdlib/mblen.c (mblen): Likewise.
* stdlib/mbtowc.c (mbtowc): Likewise.
* stdlib/wctomb.c (wctomb): Likewise.
* wcsmbs/mbsrtowcs.c (__mbsrtowcs): Likewise.
Remove calls to wcsmbs_get_towc_func and wcsmbs_free_funcs.
* wcsmbs/mbsrtowcs_l.c (wcsmbs_get_towc_func, wcsmbs_free_funcs):
Removed.
Diffstat (limited to 'wcsmbs/mbsrtowcs_l.c')
| -rw-r--r-- | wcsmbs/mbsrtowcs_l.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/wcsmbs/mbsrtowcs_l.c b/wcsmbs/mbsrtowcs_l.c index 47ba82f..0890803 100644 --- a/wcsmbs/mbsrtowcs_l.c +++ b/wcsmbs/mbsrtowcs_l.c @@ -21,35 +21,5 @@ #include <string.h> #include "wcsmbsload.h" - -static inline struct __gconv_step * -wcsmbs_get_towc_func (__locale_t l) -{ - const char *charset; - int use_translit; - char *norm; - size_t nsteps; - - charset = l->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX(CODESET)].string; - - /* Transliteration requested? */ - use_translit = l->__locales[LC_CTYPE]->use_translit; - - /* Normalize the name. */ - norm = norm_add_slashes (charset, use_translit ? "TRANSLIT" : NULL); - - return __wcsmbs_getfct ("INTERNAL", charset, &nsteps) ?: &__wcsmbs_to_wc; -} - - -static inline void -wcsmbs_free_funcs (struct __gconv_step *step) -{ - if (step != &__wcsmbs_to_wc) - /* There is only one step. */ - __gconv_close_transform (step, 1); -} - - #define USE_IN_EXTENDED_LOCALE_MODEL 1 #include "mbsrtowcs.c" |