stdlib: Use plain static for local mbstate_t vars

Functions that provide a static mbstate_t context aren't required to
be re-entrant, so stop making those thread-local.

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

Author: keith-packard

newlib/libc/stdlib/mblen.c

@@ -44,27 +44,26 @@ effects vary with the locale.
 #include "local.h"
 
 int
-mblen (const char *s,
-        size_t n)
+mblen (const char *s, size_t n)
 {
 #ifdef _MB_CAPABLE
-  int retval = 0;
-  static NEWLIB_THREAD_LOCAL _mbstate_t _mblen_state;
+    int retval = 0;
+    static _mbstate_t _mblen_state;
 
-  retval = __MBTOWC (NULL, s, n, &_mblen_state);
-  if (retval < 0)
+    retval = __MBTOWC (NULL, s, n, &_mblen_state);
+    if (retval < 0)
     {
-      _mblen_state.__count = 0;
-      return -1;
+        _mblen_state.__count = 0;
+        return -1;
     }
-  else
-    return retval;
+    else
+        return retval;
 
 #else /* not _MB_CAPABLE */
-  if (s == NULL || *s == '\0')
-    return 0;
-  if (n == 0)
-    return -1;
-  return 1;
+    if (s == NULL || *s == '\0')
+        return 0;
+    if (n == 0)
+        return -1;
+    return 1;
 #endif /* not _MB_CAPABLE */
 }

newlib/libc/stdlib/mbrtowc.c

@@ -19,7 +19,7 @@ mbrtowc (wchar_t *__restrict pwc,
 #ifdef _MB_CAPABLE
   if (ps == NULL)
     {
-      static NEWLIB_THREAD_LOCAL mbstate_t _mbrtowc_state;
+      static mbstate_t _mbrtowc_state;
       ps = &_mbrtowc_state;
     }
 #endif
@@ -31,7 +31,9 @@ mbrtowc (wchar_t *__restrict pwc,
 
   if (retval == -1)
     {
+#ifdef _MB_CAPABLE
       ps->__count = 0;
+#endif
       _REENT_ERRNO(reent) = EILSEQ;
       return (size_t)(-1);
     }

newlib/libc/stdlib/mbsnrtowcs.c

@@ -20,7 +20,7 @@ SYNOPSIS
 			 mbstate_t *__restrict <[ps]>);
 
 	#include <wchar.h>
-	size_t mbsnrtowcs(wchar_t *__ restrict <[dst]>, 
+	size_t mbsnrtowcs(wchar_t *__ restrict <[dst]>,
 			  const char **__restrict <[src]>, size_t <[nms]>,
 			  size_t <[len]>, mbstate_t *__restrict <[ps]>);
 
@@ -78,7 +78,7 @@ mbsnrtowcs (
 #ifdef _MB_CAPABLE
   if (ps == NULL)
     {
-      static NEWLIB_THREAD_LOCAL mbstate_t _mbsrtowcs_state;
+      static mbstate_t _mbsrtowcs_state;
       ps = &_mbsrtowcs_state;
     }
 #endif
@@ -90,8 +90,8 @@ mbsnrtowcs (
       len = (size_t)-1;
       tmp_src = *src;
       src = &tmp_src;
-    }      
-  
+    }
+
   max = len;
   while (len > 0)
     {

newlib/libc/stdlib/mbtowc.c

@@ -49,31 +49,26 @@ effects vary with the locale.
 #include <wchar.h>
 #include "local.h"
 
+#ifdef _MB_CAPABLE
+static mbstate_t _mbtowc_state;
+#define ps &_mbtowc_state
+#else
+#define ps NULL
+#endif
+
 int
 mbtowc (wchar_t *__restrict pwc,
         const char *__restrict s,
         size_t n)
 {
-#ifdef _MB_CAPABLE
-  int retval = 0;
-  static NEWLIB_THREAD_LOCAL mbstate_t _mbtowc_state;
+        int retval;
 
-  retval = __MBTOWC (pwc, s, n, &_mbtowc_state);
-
-  if (retval == -1)
-    {
-      _mbtowc_state.__count = 0;
-      _REENT_ERRNO(r) = EILSEQ;
-      return -1;
-    }
-  return retval;
-#else /* not _MB_CAPABLE */
-  if (s == NULL)
-    return 0;
-  if (n == 0)
-    return -1;
-  if (pwc)
-    *pwc = (wchar_t) *s;
-  return (*s != '\0');
-#endif /* not _MB_CAPABLE */
+        retval = __MBTOWC (pwc, s, n, ps);
+        if (retval == -1) {
+#ifdef _MB_CAPABLE
+                _mbtowc_state.__count = 0;
+#endif
+                errno = EILSEQ;
+        }
+        return retval;
 }

newlib/libc/stdlib/wcrtomb.c

@@ -18,7 +18,7 @@ wcrtomb (char *__restrict s,
 #ifdef _MB_CAPABLE
   if (ps == NULL)
     {
-      static NEWLIB_THREAD_LOCAL mbstate_t _wcrtomb_state;
+      static mbstate_t _wcrtomb_state;
       ps = &_wcrtomb_state;
     }
 #endif
@@ -30,7 +30,9 @@ wcrtomb (char *__restrict s,
 
   if (retval == -1)
     {
+#ifdef _MB_CAPABLE
       ps->__count = 0;
+#endif
       _REENT_ERRNO(reent) = EILSEQ;
       return (size_t)(-1);
     }

newlib/libc/stdlib/wcsnrtombs.c

@@ -74,7 +74,7 @@ PORTABILITY
 
 size_t
 _wcsnrtombs_l (char *dst, const wchar_t **src, size_t nwc,
-	       size_t len, mbstate_t *ps, struct __locale_t *loc)
+	       size_t len, mbstate_t *ps, locale_t loc)
 {
   char *ptr = dst;
   char buff[10];
@@ -85,7 +85,7 @@ _wcsnrtombs_l (char *dst, const wchar_t **src, size_t nwc,
 #ifdef _MB_CAPABLE
   if (ps == NULL)
     {
-      static NEWLIB_THREAD_LOCAL mbstate_t _wcsrtombs_state;
+      static mbstate_t _wcsrtombs_state;
       ps = &_wcsrtombs_state;
     }
 #endif
@@ -135,7 +135,7 @@ _wcsnrtombs_l (char *dst, const wchar_t **src, size_t nwc,
     }
 
   return n;
-} 
+}
 
 size_t
 wcsnrtombs (char *__restrict dst,

newlib/libc/stdlib/wctomb.c

@@ -46,31 +46,25 @@ effects vary with the locale.
 #include <errno.h>
 #include "local.h"
 
+#ifdef _MB_CAPABLE
+static mbstate_t _mbtowc_state;
+#define ps &_mbtowc_state
+#else
+#define ps NULL
+#endif
+
 int
 wctomb (char *s,
         wchar_t wchar)
 {
-#ifdef _MB_CAPABLE
         int retval;
-	static NEWLIB_THREAD_LOCAL mbstate_t _wctomb_state;
 
-        retval = __WCTOMB (s, wchar, &_wctomb_state);
+        retval = __WCTOMB (s, wchar, ps);
         if (retval == -1) {
-                _wctomb_state.__count = 0;
+#ifdef _MB_CAPABLE
+                _mbtowc_state.__count = 0;
+#endif
                 errno = EILSEQ;
         }
         return retval;
-#else /* not _MB_CAPABLE */
-        if (s == NULL)
-                return 0;
-
-	/* Verify that wchar is a valid single-byte character.  */
-	if ((size_t)wchar >= 0x100) {
-		errno = EILSEQ;
-		return -1;
-	}
-
-        *s = (char) wchar;
-        return 1;
-#endif /* not _MB_CAPABLE */
 }