about summary refs log tree commit diff
path: root/ctype
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2017-06-20 09:26:43 -0400
committerZack Weinberg <zackw@panix.com>2017-06-20 20:30:06 -0400
commitaf85385f311c574590381f7897461643f8a2fe6f (patch)
treeb1cd7d3f16a4e66a60db7fd714b6cb9823fbdc35 /ctype
parentf0be25b6336db7492e47d2e8e72eb8af53b5506d (diff)
downloadglibc-af85385f311c574590381f7897461643f8a2fe6f.tar.gz
glibc-af85385f311c574590381f7897461643f8a2fe6f.tar.xz
glibc-af85385f311c574590381f7897461643f8a2fe6f.zip
Use locale_t, not __locale_t, throughout glibc
<locale.h> 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.
Diffstat (limited to 'ctype')
-rw-r--r--ctype/ctype-c99_l.c2
-rw-r--r--ctype/ctype.h10
-rw-r--r--ctype/ctype_l.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/ctype/ctype-c99_l.c b/ctype/ctype-c99_l.c
index efb5a67bb5..da543593f9 100644
--- a/ctype/ctype-c99_l.c
+++ b/ctype/ctype-c99_l.c
@@ -20,7 +20,7 @@
 #include <ctype.h>
 
 int
-__isblank_l (int c, __locale_t l)
+__isblank_l (int c, locale_t l)
 {
   return __isctype_l (c, _ISblank, l);
 }
diff --git a/ctype/ctype.h b/ctype/ctype.h
index ce598d53e5..1fcbb660d6 100644
--- a/ctype/ctype.h
+++ b/ctype/ctype.h
@@ -242,7 +242,7 @@ __NTH (toupper (int __c))
   ((locale)->__ctype_b[(int) (c)] & (unsigned short int) type)
 
 # define __exctype_l(name) 						      \
-  extern int name (int, __locale_t) __THROW
+  extern int name (int, locale_t) __THROW
 
 /* The following names are all functions:
      int isCHARACTERISTIC(int c, locale_t *locale);
@@ -264,12 +264,12 @@ __exctype_l (isblank_l);
 
 
 /* Return the lowercase version of C in locale L.  */
-extern int __tolower_l (int __c, __locale_t __l) __THROW;
-extern int tolower_l (int __c, __locale_t __l) __THROW;
+extern int __tolower_l (int __c, locale_t __l) __THROW;
+extern int tolower_l (int __c, locale_t __l) __THROW;
 
 /* Return the uppercase version of C.  */
-extern int __toupper_l (int __c, __locale_t __l) __THROW;
-extern int toupper_l (int __c, __locale_t __l) __THROW;
+extern int __toupper_l (int __c, locale_t __l) __THROW;
+extern int toupper_l (int __c, locale_t __l) __THROW;
 
 # if __GNUC__ >= 2 && defined __OPTIMIZE__ && !defined __cplusplus
 #  define __tolower_l(c, locale) \
diff --git a/ctype/ctype_l.c b/ctype/ctype_l.c
index a7b5f5238a..e565068c20 100644
--- a/ctype/ctype_l.c
+++ b/ctype/ctype_l.c
@@ -21,7 +21,7 @@
 /* Provide real-function versions of all the ctype macros.  */
 
 #define	func(name, type) \
-  int __##name (int c, __locale_t l) { return __isctype_l (c, type, l); } \
+  int __##name (int c, locale_t l) { return __isctype_l (c, type, l); } \
   weak_alias (__##name, name)
 
 func (isalnum_l, _ISalnum)
@@ -37,14 +37,14 @@ func (isupper_l, _ISupper)
 func (isxdigit_l, _ISxdigit)
 
 int
-(__tolower_l) (int c, __locale_t l)
+(__tolower_l) (int c, locale_t l)
 {
   return l->__ctype_tolower[c];
 }
 weak_alias (__tolower_l, tolower_l)
 
 int
-(__toupper_l) (int c, __locale_t l)
+(__toupper_l) (int c, locale_t l)
 {
   return l->__ctype_toupper[c];
 }