mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +00:00
963102971d
* 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.
82 lines
2.7 KiB
C
82 lines
2.7 KiB
C
/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#ifndef _WCSMBSLOAD_H
|
|
#define _WCSMBSLOAD_H 1
|
|
|
|
#include <locale.h>
|
|
#include <wchar.h>
|
|
#include <locale/localeinfo.h>
|
|
|
|
|
|
/* Contains pointers to the used functions in the `gconv' modules. */
|
|
struct gconv_fcts
|
|
{
|
|
struct __gconv_step *towc;
|
|
size_t towc_nsteps;
|
|
struct __gconv_step *tomb;
|
|
size_t tomb_nsteps;
|
|
};
|
|
|
|
/* Set of currently active conversion functions. */
|
|
extern const struct gconv_fcts __wcsmbs_gconv_fcts_c attribute_hidden;
|
|
|
|
/* Load conversion functions for the currently selected locale. */
|
|
extern void __wcsmbs_load_conv (struct locale_data *new_category)
|
|
internal_function;
|
|
|
|
/* Clone the current `__wcsmbs_load_conv' value. */
|
|
extern void __wcsmbs_clone_conv (struct gconv_fcts *copy)
|
|
internal_function;
|
|
|
|
/* Find the conversion functions for converting to and from NAME. */
|
|
extern int __wcsmbs_named_conv (struct gconv_fcts *copy, const char *name)
|
|
internal_function;
|
|
|
|
/* Function used for the `private.cleanup' hook. */
|
|
extern void _nl_cleanup_ctype (struct locale_data *)
|
|
internal_function attribute_hidden;
|
|
|
|
|
|
#include <iconv/gconv_int.h>
|
|
|
|
|
|
/* Load the function implementation if necessary. */
|
|
extern struct __gconv_step *__wcsmbs_getfct (const char *to, const char *from,
|
|
size_t *nstepsp)
|
|
attribute_hidden;
|
|
|
|
extern const struct locale_data _nl_C_LC_CTYPE attribute_hidden;
|
|
|
|
/* Check whether the LC_CTYPE locale changed since the last call.
|
|
Update the pointers appropriately. */
|
|
static inline const struct gconv_fcts *
|
|
get_gconv_fcts (struct locale_data *data)
|
|
{
|
|
if (__builtin_expect (data->private.ctype == NULL, 0))
|
|
{
|
|
if (__builtin_expect (data == &_nl_C_LC_CTYPE, 0))
|
|
return &__wcsmbs_gconv_fcts_c;
|
|
__wcsmbs_load_conv (data);
|
|
}
|
|
return data->private.ctype;
|
|
}
|
|
|
|
#endif /* wcsmbsload.h */
|