aboutsummaryrefslogtreecommitdiff
path: root/wcsmbs/wcsnrtombs.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-09-02 19:34:39 +0000
committerRoland McGrath <roland@gnu.org>2002-09-02 19:34:39 +0000
commit963102971df9fbcd967a46748efc854d269cee1f (patch)
tree352ea540316cec578b89ff90b8d9915536906870 /wcsmbs/wcsnrtombs.c
parent1977e59058a8a5260770cade67676bd93f896fdf (diff)
downloadglibc-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/wcsnrtombs.c')
-rw-r--r--wcsmbs/wcsnrtombs.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c
index 1d40394..bb2ca1d 100644
--- a/wcsmbs/wcsnrtombs.c
+++ b/wcsmbs/wcsnrtombs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
@@ -49,6 +49,7 @@ __wcsnrtombs (dst, src, nwc, len, ps)
int status;
size_t result;
struct __gconv_step *tomb;
+ const struct gconv_fcts *fcts;
/* Tell where we want the result. */
data.__invocation_counter = 0;
@@ -61,11 +62,11 @@ __wcsnrtombs (dst, src, nwc, len, ps)
return 0;
srcend = *src + __wcsnlen (*src, nwc - 1) + 1;
- /* Make sure we use the correct function. */
- update_conversion_ptrs ();
+ /* Get the conversion functions. */
+ fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
/* Get the structure with the function pointers. */
- tomb = __wcsmbs_gconv_fcts.tomb;
+ tomb = fcts->tomb;
/* We have to handle DST == NULL special. */
if (dst == NULL)