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.c | |
| parent | 1977e59058a8a5260770cade67676bd93f896fdf (diff) | |
| download | glibc-963102971df9fbcd967a46748efc854d269cee1f.tar glibc-963102971df9fbcd967a46748efc854d269cee1f.tar.gz glibc-963102971df9fbcd967a46748efc854d269cee1f.tar.bz2 glibc-963102971df9fbcd967a46748efc854d269cee1f.zip | |
* 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.c')
| -rw-r--r-- | wcsmbs/mbsrtowcs.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c index 097e462110..602dd5e64c 100644 --- a/wcsmbs/mbsrtowcs.c +++ b/wcsmbs/mbsrtowcs.c @@ -58,6 +58,7 @@ __mbsrtowcs (dst, src, len, ps) int status; struct __gconv_step *towc; size_t non_reversible; + const struct gconv_fcts *fcts; /* Tell where we want the result. */ data.__invocation_counter = 0; @@ -70,16 +71,15 @@ __mbsrtowcs (dst, src, len, ps) #endif data.__trans = NULL; + /* Get the conversion functions. */ #ifdef USE_IN_EXTENDED_LOCALE_MODEL - /* Get the conversion function matching the locale. */ - towc = wcsmbs_get_towc_func (l); + fcts = get_gconv_fcts (l->__locales[LC_CTYPE]); #else - /* Make sure we use the correct function. */ - update_conversion_ptrs (); + fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE)); +#endif /* Get the structure with the function pointers. */ - towc = __wcsmbs_gconv_fcts.towc; -#endif + towc = fcts->towc; /* We have to handle DST == NULL special. */ if (dst == NULL) @@ -160,11 +160,6 @@ __mbsrtowcs (dst, src, len, ps) __set_errno (EILSEQ); } -#ifdef USE_IN_EXTENDED_LOCALE_MODEL - /* Free the conversion function data structures. */ - wcsmbs_free_funcs (towc); -#endif - return result; } #ifndef USE_IN_EXTENDED_LOCALE_MODEL |