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. --- wcsmbs/mbsrtowcs_l.c | 2 +- wcsmbs/wchar.h | 26 +++++++++++++------------- wcsmbs/wcscasecmp.c | 2 +- wcsmbs/wcsncase.c | 2 +- wcsmbs/wcstod.c | 2 +- wcsmbs/wcstod_l.c | 2 +- wcsmbs/wcstof.c | 2 +- wcsmbs/wcstof_l.c | 2 +- wcsmbs/wcstol_l.c | 2 +- wcsmbs/wcstold.c | 2 +- wcsmbs/wcstold_l.c | 2 +- wcsmbs/wcstoll_l.c | 2 +- wcsmbs/wcstoul_l.c | 2 +- wcsmbs/wcstoull_l.c | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) (limited to 'wcsmbs') diff --git a/wcsmbs/mbsrtowcs_l.c b/wcsmbs/mbsrtowcs_l.c index 4ffb652..33b432a 100644 --- a/wcsmbs/mbsrtowcs_l.c +++ b/wcsmbs/mbsrtowcs_l.c @@ -38,7 +38,7 @@ size_t attribute_hidden __mbsrtowcs_l (wchar_t *dst, const char **src, size_t len, mbstate_t *ps, - __locale_t l) + locale_t l) { struct __gconv_step_data data; size_t result; diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 9054661..4f16f98 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -120,10 +120,10 @@ extern int wcsncasecmp (const wchar_t *__s1, const wchar_t *__s2, /* Similar to the two functions above but take the information from the provided locale and not the global locale. */ extern int wcscasecmp_l (const wchar_t *__s1, const wchar_t *__s2, - __locale_t __loc) __THROW; + locale_t __loc) __THROW; extern int wcsncasecmp_l (const wchar_t *__s1, const wchar_t *__s2, - size_t __n, __locale_t __loc) __THROW; + size_t __n, locale_t __loc) __THROW; #endif /* Compare S1 and S2, both interpreted as appropriate to the @@ -142,13 +142,13 @@ extern size_t wcsxfrm (wchar_t *__restrict __s1, /* Compare S1 and S2, both interpreted as appropriate to the LC_COLLATE category of the given locale. */ extern int wcscoll_l (const wchar_t *__s1, const wchar_t *__s2, - __locale_t __loc) __THROW; + locale_t __loc) __THROW; /* Transform S2 into array pointed to by S1 such that if wcscmp is applied to two transformed strings the result is the as applying `wcscoll' to the original strings. */ extern size_t wcsxfrm_l (wchar_t *__s1, const wchar_t *__s2, - size_t __n, __locale_t __loc) __THROW; + size_t __n, locale_t __loc) __THROW; /* Duplicate S, returning an identical malloc'd string. */ extern wchar_t *wcsdup (const wchar_t *__s) __THROW __attribute_malloc__; @@ -441,39 +441,39 @@ extern unsigned long long int wcstouq (const wchar_t *__restrict __nptr, by the POSIX.1-2008 extended locale API. */ extern long int wcstol_l (const wchar_t *__restrict __nptr, wchar_t **__restrict __endptr, int __base, - __locale_t __loc) __THROW; + locale_t __loc) __THROW; extern unsigned long int wcstoul_l (const wchar_t *__restrict __nptr, wchar_t **__restrict __endptr, - int __base, __locale_t __loc) __THROW; + int __base, locale_t __loc) __THROW; __extension__ extern long long int wcstoll_l (const wchar_t *__restrict __nptr, wchar_t **__restrict __endptr, - int __base, __locale_t __loc) __THROW; + int __base, locale_t __loc) __THROW; __extension__ extern unsigned long long int wcstoull_l (const wchar_t *__restrict __nptr, wchar_t **__restrict __endptr, - int __base, __locale_t __loc) + int __base, locale_t __loc) __THROW; extern double wcstod_l (const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, __locale_t __loc) + wchar_t **__restrict __endptr, locale_t __loc) __THROW; extern float wcstof_l (const wchar_t *__restrict __nptr, - wchar_t **__restrict __endptr, __locale_t __loc) + wchar_t **__restrict __endptr, locale_t __loc) __THROW; extern long double wcstold_l (const wchar_t *__restrict __nptr, wchar_t **__restrict __endptr, - __locale_t __loc) __THROW; + locale_t __loc) __THROW; # if __HAVE_FLOAT128 extern _Float128 wcstof128_l (const wchar_t *__restrict __nptr, wchar_t **__restrict __endptr, - __locale_t __loc) __THROW; + locale_t __loc) __THROW; # endif #endif /* use GNU */ @@ -775,7 +775,7 @@ extern size_t wcsftime (wchar_t *__restrict __s, size_t __maxsize, extern size_t wcsftime_l (wchar_t *__restrict __s, size_t __maxsize, const wchar_t *__restrict __format, const struct tm *__restrict __tp, - __locale_t __loc) __THROW; + locale_t __loc) __THROW; # endif /* Define some macros helping to catch buffer overflows. */ diff --git a/wcsmbs/wcscasecmp.c b/wcsmbs/wcscasecmp.c index 0f02e50..e5db009 100644 --- a/wcsmbs/wcscasecmp.c +++ b/wcsmbs/wcscasecmp.c @@ -35,7 +35,7 @@ #endif #ifdef USE_IN_EXTENDED_LOCALE_MODEL -# define LOCALE_PARAM , __locale_t loc +# define LOCALE_PARAM , locale_t loc #else # define LOCALE_PARAM #endif diff --git a/wcsmbs/wcsncase.c b/wcsmbs/wcsncase.c index 945434c..82fc31b 100644 --- a/wcsmbs/wcsncase.c +++ b/wcsmbs/wcsncase.c @@ -37,7 +37,7 @@ #endif #ifdef USE_IN_EXTENDED_LOCALE_MODEL -# define LOCALE_PARAM , __locale_t loc +# define LOCALE_PARAM , locale_t loc #else # define LOCALE_PARAM #endif diff --git a/wcsmbs/wcstod.c b/wcsmbs/wcstod.c index 72fa7ea..4604f51 100644 --- a/wcsmbs/wcstod.c +++ b/wcsmbs/wcstod.c @@ -23,6 +23,6 @@ #define USE_WIDE_CHAR 1 extern double ____wcstod_l_internal (const wchar_t *, wchar_t **, int, - __locale_t); + locale_t); #include diff --git a/wcsmbs/wcstod_l.c b/wcsmbs/wcstod_l.c index 1d5c67c..7790f5a 100644 --- a/wcsmbs/wcstod_l.c +++ b/wcsmbs/wcstod_l.c @@ -22,7 +22,7 @@ extern double ____wcstod_l_internal (const wchar_t *, wchar_t **, int, - __locale_t); + locale_t); #define USE_WIDE_CHAR 1 diff --git a/wcsmbs/wcstof.c b/wcsmbs/wcstof.c index 67c16e0..e91c09c 100644 --- a/wcsmbs/wcstof.c +++ b/wcsmbs/wcstof.c @@ -22,6 +22,6 @@ #define USE_WIDE_CHAR 1 extern float ____wcstof_l_internal (const wchar_t *, wchar_t **, int, - __locale_t); + locale_t); #include diff --git a/wcsmbs/wcstof_l.c b/wcsmbs/wcstof_l.c index d430bf1..143b716 100644 --- a/wcsmbs/wcstof_l.c +++ b/wcsmbs/wcstof_l.c @@ -24,6 +24,6 @@ #define USE_WIDE_CHAR 1 extern float ____wcstof_l_internal (const wchar_t *, wchar_t **, int, - __locale_t); + locale_t); #include diff --git a/wcsmbs/wcstol_l.c b/wcsmbs/wcstol_l.c index 744f8f8..42bd842 100644 --- a/wcsmbs/wcstol_l.c +++ b/wcsmbs/wcstol_l.c @@ -24,6 +24,6 @@ #define USE_WIDE_CHAR 1 extern long int ____wcstol_l_internal (const wchar_t *, wchar_t **, int, int, - __locale_t); + locale_t); #include diff --git a/wcsmbs/wcstold.c b/wcsmbs/wcstold.c index 816f43b..7a14cd2 100644 --- a/wcsmbs/wcstold.c +++ b/wcsmbs/wcstold.c @@ -22,6 +22,6 @@ #define USE_WIDE_CHAR 1 extern long double ____wcstold_l_internal (const wchar_t *, wchar_t **, int, - __locale_t); + locale_t); #include diff --git a/wcsmbs/wcstold_l.c b/wcsmbs/wcstold_l.c index 86f63e8..a7ab025 100644 --- a/wcsmbs/wcstold_l.c +++ b/wcsmbs/wcstold_l.c @@ -23,6 +23,6 @@ #define USE_WIDE_CHAR 1 extern long double ____wcstold_l_internal (const wchar_t *, wchar_t **, int, - __locale_t); + locale_t); #include diff --git a/wcsmbs/wcstoll_l.c b/wcsmbs/wcstoll_l.c index 225153f..598d3f5 100644 --- a/wcsmbs/wcstoll_l.c +++ b/wcsmbs/wcstoll_l.c @@ -24,6 +24,6 @@ #define QUAD 1 extern long long int ____wcstoll_l_internal (const wchar_t *, wchar_t **, - int, int, __locale_t); + int, int, locale_t); #include diff --git a/wcsmbs/wcstoul_l.c b/wcsmbs/wcstoul_l.c index 0847284..f9f3808 100644 --- a/wcsmbs/wcstoul_l.c +++ b/wcsmbs/wcstoul_l.c @@ -24,6 +24,6 @@ #define UNSIGNED 1 extern unsigned long int ____wcstoul_l_internal (const wchar_t *, wchar_t **, - int, int, __locale_t); + int, int, locale_t); #include "wcstol_l.c" diff --git a/wcsmbs/wcstoull_l.c b/wcsmbs/wcstoull_l.c index 532d01a..412a9fc 100644 --- a/wcsmbs/wcstoull_l.c +++ b/wcsmbs/wcstoull_l.c @@ -25,6 +25,6 @@ extern unsigned long long int ____wcstoull_l_internal (const wchar_t *, wchar_t **, int, int, - __locale_t); + locale_t); #include -- cgit v1.1