From 1ab62b326e22ee3c9ab8b8b4144953698bc82cff Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 6 Aug 2002 08:40:20 +0000 Subject: * locale/Versions (libc: GLIBC_2.3): Add all the *_l functions with no __ prefix. * locale/langinfo.h [__USE_GNU]: Declare nl_langinfo_l. * ctype/ctype.h [__USE_GNU]: Add declarations and macros for all *_l functions with no __ prefix. * wctype/wcfuncs_l.c: Define weak aliases without __ for all fns. * ctype/ctype_l.c: Likewise. * locale/nl_langinfo.c: Likewise. * string/string.h [__USE_GNU]: Add decls for all *_l fns with no __. * stdlib/stdlib.h [__USE_GNU]: Likewise. * wcsmbs/wchar.h [__USE_GNU]: Likewise. * wctype/wctype.h [__USE_GNU]: Likewise. * string/strcoll_l.c (strcoll_l): Define as weak alias. * string/strxfrm_l.c (strxfrm_l): Define as weak alias. * sysdeps/generic/strcasecmp_l.c (strcasecmp_l): Define as weak alias. * sysdeps/generic/strncase_l.c (strncasecmp_l): Define as weak alias. * stdlib/strtod_l.c (strtod_l): Define as weak alias. * stdlib/strtof_l.c (strtof_l): Define as weak alias. * stdlib/strtold_l.c (strtold_l): Define as weak alias. * wcsmbs/wcscasecmp_l.c (wcscasecmp_l): Define as weak alias. (__wcscasecmp_l): Add libc_hidden_def. * wcsmbs/wcsncase_l.c (wcsncasecmp_l): Define as weak alias. (__wcsncasecmp_l): Add libc_hidden_def. * wcsmbs/wcstof_l.c (wcstof_l): Define as weak alias. * wcsmbs/wcstod_l.c (wcstod_l): Define as weak alias. * wcsmbs/wcstold_l.c (wcstold_l): Define as weak alias. * wcsmbs/wcscoll_l.c (wcscoll_l): Define as weak alias. * wcsmbs/wcsxfrm_l.c (wcsxfrm_l): Define as weak alias. * sysdeps/generic/wcstol_l.c (wcstol_l): Define as weak alias. * sysdeps/generic/wcstoll_l.c (wcstoll_l): Define as weak alias. * sysdeps/generic/wcstoul_l.c (wcstoul_l): Define as weak alias. * sysdeps/generic/wcstoull_l.c (wcstoull_l): Define as weak alias. * sysdeps/wordsize-64/wcstol_l.c (wcstoll_l): Define as weak alias. * sysdeps/wordsize-64/wcstoul_l.c (wcstoull_l): Define as weak alias. * wctype/wctrans_l.c (wctrans_l) Define as weak alias. * wctype/towctrans_l.c (towctrans_l) Define as weak alias. * wctype/wctype_l.c (wctype_l) Define as weak alias. --- wctype/towctrans_l.c | 3 ++- wctype/wcfuncs_l.c | 31 +++++++++++++++++-------------- wctype/wctrans_l.c | 3 ++- wctype/wctype.h | 23 ++++++++++++++++++++++- wctype/wctype_l.c | 5 +++-- 5 files changed, 46 insertions(+), 19 deletions(-) (limited to 'wctype') diff --git a/wctype/towctrans_l.c b/wctype/towctrans_l.c index e80ecb53d0..28a4fd0530 100644 --- a/wctype/towctrans_l.c +++ b/wctype/towctrans_l.c @@ -1,5 +1,5 @@ /* Map wide character using given mapping and locale. - Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2000, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -33,3 +33,4 @@ __towctrans_l (wint_t wc, wctrans_t desc, __locale_t locale) return wctrans_table_lookup ((const char *) desc, wc); } +weak_alias (__towctrans_l, towctrans_l) diff --git a/wctype/wcfuncs_l.c b/wctype/wcfuncs_l.c index df6b9dfd43..5556dc4adc 100644 --- a/wctype/wcfuncs_l.c +++ b/wctype/wcfuncs_l.c @@ -27,26 +27,27 @@ /* Provide real-function versions of all the wctype macros. */ #define func(name, type) \ - int name (wint_t wc, __locale_t locale) \ + int __##name (wint_t wc, __locale_t locale) \ { \ 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); \ } \ - libc_hidden_def (name) + libc_hidden_def (__##name) \ + weak_alias (__##name, name) -func (__iswalnum_l, __ISwalnum) -func (__iswalpha_l, __ISwalpha) -func (__iswblank_l, __ISwblank) -func (__iswcntrl_l, __ISwcntrl) -func (__iswdigit_l, __ISwdigit) -func (__iswlower_l, __ISwlower) -func (__iswgraph_l, __ISwgraph) -func (__iswprint_l, __ISwprint) -func (__iswpunct_l, __ISwpunct) -func (__iswspace_l, __ISwspace) -func (__iswupper_l, __ISwupper) -func (__iswxdigit_l, __ISwxdigit) +func (iswalnum_l, __ISwalnum) +func (iswalpha_l, __ISwalpha) +func (iswblank_l, __ISwblank) +func (iswcntrl_l, __ISwcntrl) +func (iswdigit_l, __ISwdigit) +func (iswlower_l, __ISwlower) +func (iswgraph_l, __ISwgraph) +func (iswprint_l, __ISwprint) +func (iswpunct_l, __ISwpunct) +func (iswspace_l, __ISwspace) +func (iswupper_l, __ISwupper) +func (iswxdigit_l, __ISwxdigit) wint_t (__towlower_l) (wint_t wc, __locale_t locale) @@ -56,6 +57,7 @@ wint_t return wctrans_table_lookup (desc, wc); } libc_hidden_def (__towlower_l) +weak_alias (__towlower_l, towlower_l) wint_t (__towupper_l) (wint_t wc, __locale_t locale) @@ -65,3 +67,4 @@ wint_t return wctrans_table_lookup (desc, wc); } libc_hidden_def (__towupper_l) +weak_alias (__towupper_l, towupper_l) diff --git a/wctype/wctrans_l.c b/wctype/wctrans_l.c index da124a78f2..303b50ddbe 100644 --- a/wctype/wctrans_l.c +++ b/wctype/wctrans_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996,1997,1999,2000,2001 Free Software Foundation, Inc. +/* Copyright (C) 1996,97,99,2000,01,02 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -45,3 +45,4 @@ __wctrans_l (const char *property, __locale_t locale) i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + cnt; return (wctrans_t) locale->__locales[LC_CTYPE]->values[i].string; } +weak_alias (__wctrans_l, wctrans_l) diff --git a/wctype/wctype.h b/wctype/wctype.h index e4e8e29f4c..1b5d76883b 100644 --- a/wctype/wctype.h +++ b/wctype/wctype.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. +/* Copyright (C) 1996,97,98,99,2000,01,02 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -307,60 +307,75 @@ extern int __iswalnum_l (wint_t __wc, __locale_t __locale) __THROW; wide-characters for which none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ extern int __iswalpha_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswalpha_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any control wide character. */ extern int __iswcntrl_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswcntrl_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character that corresponds to a decimal-digit character. */ extern int __iswdigit_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswdigit_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character for which `iswprint' is true and `iswspace' is false. */ extern int __iswgraph_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswgraph_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character that corresponds to a lowercase letter or is one of a locale-specific set of wide characters for which none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ extern int __iswlower_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswlower_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any printing wide character. */ extern int __iswprint_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswprint_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any printing wide character that is one of a locale-specific et of wide characters for which neither `iswspace' nor `iswalnum' is true. */ extern int __iswpunct_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswpunct_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character that corresponds to a locale-specific set of wide characters for which none of `iswalnum', `iswgraph', or `iswpunct' is true. */ extern int __iswspace_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswspace_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character that corresponds to an uppercase letter or is one of a locale-specific set of wide character for which none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ extern int __iswupper_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswupper_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character that corresponds to a hexadecimal-digit character equivalent to that performed be the functions described in the previous subclause. */ extern int __iswxdigit_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswxdigit_l (wint_t __wc, __locale_t __locale) __THROW; /* Test for any wide character that corresponds to a standard blank wide character or a locale-specific set of wide characters for which `iswalnum' is false. */ extern int __iswblank_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswblank_l (wint_t __wc, __locale_t __locale) __THROW; /* Construct value that describes a class of wide characters identified by the string argument PROPERTY. */ extern wctype_t __wctype_l (__const char *__property, __locale_t __locale) __THROW; +extern wctype_t wctype_l (__const char *__property, __locale_t __locale) + __THROW; /* Determine whether the wide-character WC has the property described by DESC. */ extern int __iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale) __THROW; +extern int iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale) + __THROW; /* @@ -369,18 +384,24 @@ extern int __iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale) /* Converts an uppercase letter to the corresponding lowercase letter. */ extern wint_t __towlower_l (wint_t __wc, __locale_t __locale) __THROW; +extern wint_t towlower_l (wint_t __wc, __locale_t __locale) __THROW; /* Converts an lowercase letter to the corresponding uppercase letter. */ extern wint_t __towupper_l (wint_t __wc, __locale_t __locale) __THROW; +extern wint_t towupper_l (wint_t __wc, __locale_t __locale) __THROW; /* Construct value that describes a mapping between wide characters identified by the string argument PROPERTY. */ extern wctrans_t __wctrans_l (__const char *__property, __locale_t __locale) __THROW; +extern wctrans_t wctrans_l (__const char *__property, __locale_t __locale) + __THROW; /* Map the wide character WC using the mapping described by DESC. */ extern wint_t __towctrans_l (wint_t __wc, wctrans_t __desc, __locale_t __locale) __THROW; +extern wint_t towctrans_l (wint_t __wc, wctrans_t __desc, + __locale_t __locale) __THROW; # endif /* Use GNU. */ diff --git a/wctype/wctype_l.c b/wctype/wctype_l.c index c4506f895b..2062da60ae 100644 --- a/wctype/wctype_l.c +++ b/wctype/wctype_l.c @@ -1,6 +1,6 @@ -/* Copyright (C) 1996, 1997, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1996,97,2000,01,02 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1996. + Contributed by Ulrich Drepper , 1996. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -47,3 +47,4 @@ __wctype_l (const char *property, __locale_t locale) i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_CLASS_OFFSET)].word + result; return (wctype_t) locale->__locales[LC_CTYPE]->values[i].string; } +weak_alias (__wctype_l, wctype_l) -- cgit 1.4.1