From af85385f311c574590381f7897461643f8a2fe6f Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Tue, 20 Jun 2017 09:26:43 -0400 Subject: Use locale_t, not __locale_t, throughout glibc is specified to define locale_t in POSIX.1-2008, and so are all of the headers that define functions that take locale_t arguments. Under _GNU_SOURCE, the additional headers that define such functions have also always defined locale_t. Therefore, there is no need to use __locale_t in public function prototypes, nor in any internal code. * ctype/ctype-c99_l.c, ctype/ctype.h, ctype/ctype_l.c * include/monetary.h, include/stdlib.h, include/time.h * include/wchar.h, locale/duplocale.c, locale/freelocale.c * locale/global-locale.c, locale/langinfo.h, locale/locale.h * locale/localeinfo.h, locale/newlocale.c * locale/nl_langinfo_l.c, locale/uselocale.c * localedata/bug-usesetlocale.c, localedata/tst-xlocale2.c * stdio-common/vfscanf.c, stdlib/monetary.h, stdlib/stdlib.h * stdlib/strfmon_l.c, stdlib/strtod_l.c, stdlib/strtof_l.c * stdlib/strtol.c, stdlib/strtol_l.c, stdlib/strtold_l.c * stdlib/strtoll_l.c, stdlib/strtoul_l.c, stdlib/strtoull_l.c * string/strcasecmp.c, string/strcoll_l.c, string/string.h * string/strings.h, string/strncase.c, string/strxfrm_l.c * sysdeps/ieee754/float128/strtof128_l.c * sysdeps/ieee754/float128/wcstof128.c * sysdeps/ieee754/float128/wcstof128_l.c * sysdeps/ieee754/ldbl-128ibm/strtold_l.c * sysdeps/ieee754/ldbl-64-128/strtold_l.c * sysdeps/ieee754/ldbl-opt/nldbl-compat.c * sysdeps/ieee754/ldbl-opt/nldbl-strfmon_l.c * sysdeps/ieee754/ldbl-opt/nldbl-strtold_l.c * sysdeps/ieee754/ldbl-opt/nldbl-wcstold_l.c * sysdeps/powerpc/powerpc32/power7/strcasecmp.S * sysdeps/powerpc/powerpc64/power7/strcasecmp.S * sysdeps/x86_64/strcasecmp_l-nonascii.c * sysdeps/x86_64/strncase_l-nonascii.c, time/strftime_l.c * time/strptime_l.c, time/time.h, wcsmbs/mbsrtowcs_l.c * wcsmbs/wchar.h, wcsmbs/wcscasecmp.c, wcsmbs/wcsncase.c * wcsmbs/wcstod.c, wcsmbs/wcstod_l.c, wcsmbs/wcstof.c * wcsmbs/wcstof_l.c, wcsmbs/wcstol_l.c, wcsmbs/wcstold.c * wcsmbs/wcstold_l.c, wcsmbs/wcstoll_l.c, wcsmbs/wcstoul_l.c * wcsmbs/wcstoull_l.c, wctype/iswctype_l.c * wctype/towctrans_l.c, wctype/wcfuncs_l.c * wctype/wctrans_l.c, wctype/wctype.h, wctype/wctype_l.c: Change all uses of __locale_t to locale_t. --- wctype/iswctype_l.c | 2 +- wctype/towctrans_l.c | 2 +- wctype/wcfuncs_l.c | 6 +++--- wctype/wctrans_l.c | 2 +- wctype/wctype.h | 36 ++++++++++++++++++------------------ wctype/wctype_l.c | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) (limited to 'wctype') diff --git a/wctype/iswctype_l.c b/wctype/iswctype_l.c index 9a5daecda5..0f85264087 100644 --- a/wctype/iswctype_l.c +++ b/wctype/iswctype_l.c @@ -24,7 +24,7 @@ int -__iswctype_l (wint_t wc, wctype_t desc, __locale_t locale) +__iswctype_l (wint_t wc, wctype_t desc, locale_t locale) { /* If the user passes in an invalid DESC valid (the one returned from `__wctype_l' in case of an error) simply return 0. */ diff --git a/wctype/towctrans_l.c b/wctype/towctrans_l.c index f45f195f07..1c6589747e 100644 --- a/wctype/towctrans_l.c +++ b/wctype/towctrans_l.c @@ -23,7 +23,7 @@ #include "wchar-lookup.h" wint_t -__towctrans_l (wint_t wc, wctrans_t desc, __locale_t locale) +__towctrans_l (wint_t wc, wctrans_t desc, locale_t locale) { /* If the user passes in an invalid DESC valid (the one returned from `__wctrans_l' in case of an error) simply return the value. */ diff --git a/wctype/wcfuncs_l.c b/wctype/wcfuncs_l.c index 994813bb62..d45dc10324 100644 --- a/wctype/wcfuncs_l.c +++ b/wctype/wcfuncs_l.c @@ -27,7 +27,7 @@ /* Provide real-function versions of all the wctype macros. */ #define func(name, type) \ - int __isw##name (wint_t wc, __locale_t locale) \ + int __isw##name (wint_t wc, locale_t locale) \ { \ if (isascii (wc)) \ return is##name ((int) wc, locale); \ @@ -54,7 +54,7 @@ func (upper_l, __ISwupper) func (xdigit_l, __ISwxdigit) wint_t -(__towlower_l) (wint_t wc, __locale_t locale) +(__towlower_l) (wint_t wc, locale_t locale) { size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + __TOW_tolower; const char *desc = locale->__locales[LC_CTYPE]->values[i].string; @@ -64,7 +64,7 @@ libc_hidden_def (__towlower_l) weak_alias (__towlower_l, towlower_l) wint_t -(__towupper_l) (wint_t wc, __locale_t locale) +(__towupper_l) (wint_t wc, locale_t locale) { size_t i = locale->__locales[LC_CTYPE]->values[_NL_ITEM_INDEX (_NL_CTYPE_MAP_OFFSET)].word + __TOW_toupper; const char *desc = locale->__locales[LC_CTYPE]->values[i].string; diff --git a/wctype/wctrans_l.c b/wctype/wctrans_l.c index 10a960bac1..e64c303c85 100644 --- a/wctype/wctrans_l.c +++ b/wctype/wctrans_l.c @@ -21,7 +21,7 @@ #include "../locale/localeinfo.h" wctrans_t -__wctrans_l (const char *property, __locale_t locale) +__wctrans_l (const char *property, locale_t locale) { const char *names; size_t cnt; diff --git a/wctype/wctype.h b/wctype/wctype.h index 7945795b44..3bcf9c6a3a 100644 --- a/wctype/wctype.h +++ b/wctype/wctype.h @@ -60,66 +60,66 @@ extern wint_t towctrans (wint_t __wc, wctrans_t __desc) __THROW; /* Test for any wide character for which `iswalpha' or `iswdigit' is true. */ -extern int iswalnum_l (wint_t __wc, __locale_t __locale) __THROW; +extern int iswalnum_l (wint_t __wc, locale_t __locale) __THROW; /* Test for any wide character for which `iswupper' or 'iswlower' is true, or any wide character that is one of a locale-specific set of 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) +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) +extern int iswctype_l (wint_t __wc, wctype_t __desc, locale_t __locale) __THROW; /* @@ -127,19 +127,19 @@ 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) +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; + locale_t __locale) __THROW; # endif /* Use POSIX 2008. */ diff --git a/wctype/wctype_l.c b/wctype/wctype_l.c index c17a1e9ce6..ea60ba315e 100644 --- a/wctype/wctype_l.c +++ b/wctype/wctype_l.c @@ -23,7 +23,7 @@ #include wctype_t -__wctype_l (const char *property, __locale_t locale) +__wctype_l (const char *property, locale_t locale) { const char *names; unsigned int result; -- cgit 1.4.1