locale: Switch locale from a struct to an int

As the only thing locale controls is LC_CTYPE, get rid of the struct
and replace it with just the LC_CTYPE value. Represent the locale as
an 'int' in the API to avoid ABI compatibility issues with enums.

Because (locale_t) 0 is a special return value from newlocale, shift
all locale ids up by one, leaving 0 for the error return. Use that for
locale_INVALID.

Signed-off-by: Keith Packard <[email protected]>

Author: keith-packard

newlib/libc/ctype/caseconv.c

@@ -19,7 +19,7 @@ static const struct caseconv_entry table [] = {
 
 /* auxiliary function for binary search in interval properties table */
 const struct caseconv_entry *
-__caseconv_lookup (wint_t ucs, struct __locale_t *locale)
+__caseconv_lookup (wint_t ucs, locale_t locale)
 {
   size_t min = 0;
   size_t max = NCASECONV-1;

newlib/libc/ctype/ctype_table.c

@@ -51,7 +51,7 @@ static struct {
 #define N_CAT_TABLE     (sizeof(ctype_table) / sizeof(ctype_table[0]))
 
 uint16_t
-__ctype_table_lookup(wint_t ic, struct __locale_t *locale)
+__ctype_table_lookup(wint_t ic, locale_t locale)
 {
     size_t      low = 0;
     size_t      high = N_CAT_TABLE - 1;

newlib/libc/ctype/isalnum_l.c

@@ -7,7 +7,7 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
 
 #undef isalnum_l
 int
-isalnum_l (int c, struct __locale_t *locale)
+isalnum_l (int c, locale_t locale)
 {
 #if _PICOLIBC_CTYPE_SMALL
     (void) locale;

newlib/libc/ctype/isalpha_l.c

@@ -7,7 +7,7 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
 
 #undef isalpha_l
 int
-isalpha_l (int c, struct __locale_t *locale)
+isalpha_l (int c, locale_t locale)
 {
 #if _PICOLIBC_CTYPE_SMALL
     (void) locale;

newlib/libc/ctype/isascii_l.c

@@ -7,7 +7,7 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
 
 #undef isascii_l
 int
-isascii_l (int c, struct __locale_t *locale)
+isascii_l (int c, locale_t locale)
 {
     (void) locale;
     return (unsigned) c <= 0177;

newlib/libc/ctype/isblank_l.c

@@ -7,7 +7,7 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
 
 #undef isblank_l
 int
-isblank_l (int c, struct __locale_t *locale)
+isblank_l (int c, locale_t locale)
 {
 #if _PICOLIBC_CTYPE_SMALL
     (void) locale;

newlib/libc/ctype/iscntrl_l.c

@@ -7,7 +7,7 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
 
 #undef iscntrl_l
 int
-iscntrl_l (int c, struct __locale_t *locale)
+iscntrl_l (int c, locale_t locale)
 {
     (void) locale;
 #if _PICOLIBC_CTYPE_SMALL

newlib/libc/ctype/isdigit_l.c

@@ -7,7 +7,7 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
 
 #undef isdigit_l
 int
-isdigit_l (int c, struct __locale_t *locale)
+isdigit_l (int c, locale_t locale)
 {
 #if _PICOLIBC_CTYPE_SMALL
     (void) locale;

newlib/libc/ctype/isgraph_l.c

@@ -8,7 +8,7 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
 
 #undef isgraph_l
 int
-isgraph_l (int c, struct __locale_t *locale)
+isgraph_l (int c, locale_t locale)
 {
 #if _PICOLIBC_CTYPE_SMALL
     (void) locale;

newlib/libc/ctype/islower_l.c

@@ -7,7 +7,7 @@ Modified (m) 2017 Thomas Wolff: revise Unicode and locale/wchar handling
 
 #undef islower_l
 int
-islower_l (int c, struct __locale_t *locale)
+islower_l (int c, locale_t locale)
 {
 #if _PICOLIBC_CTYPE_SMALL
     (void) locale;