Libc-825.24.tar.gz

[apple/libc.git] / locale / FreeBSD / wcstoumax.c.patch

diff --git a/locale/FreeBSD/wcstoumax.c.patch b/locale/FreeBSD/wcstoumax.c.patch
deleted file mode 100644 (file)
index d79d57c..0000000
--- a/locale/FreeBSD/wcstoumax.c.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- wcstoumax.c.orig   2009-11-09 15:05:25.000000000 -0800
-+++ wcstoumax.c        2009-11-09 15:05:26.000000000 -0800
-@@ -36,6 +36,8 @@ __FBSDID("FreeBSD: src/lib/libc/stdlib/s
- #endif
- __FBSDID("$FreeBSD: src/lib/libc/locale/wcstoumax.c,v 1.2 2007/01/09 00:28:01 imp Exp $");
- 
-+#include "xlocale_private.h"
-+
- #include <errno.h>
- #include <inttypes.h>
- #include <stdlib.h>
-@@ -46,8 +48,8 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/
-  * Convert a wide character string to a uintmax_t integer.
-  */
- uintmax_t
--wcstoumax(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
--    int base)
-+wcstoumax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-+    int base, locale_t loc)
- {
-       const wchar_t *s;
-       uintmax_t acc;
-@@ -55,13 +57,14 @@ wcstoumax(const wchar_t * __restrict npt
-       uintmax_t cutoff;
-       int neg, any, cutlim;
- 
-+      NORMALIZE_LOCALE(loc);
-       /*
-        * See strtoimax for comments as to the logic used.
-        */
-       s = nptr;
-       do {
-               c = *s++;
--      } while (iswspace(c));
-+      } while (iswspace_l(c, loc));
-       if (c == L'-') {
-               neg = 1;
-               c = *s++;
-@@ -86,8 +89,8 @@ wcstoumax(const wchar_t * __restrict npt
-       cutlim = UINTMAX_MAX % base;
-       for ( ; ; c = *s++) {
- #ifdef notyet
--              if (iswdigit(c))
--                      c = digittoint(c);
-+              if (iswdigit_l(c, loc))
-+                      c = digittoint_l(c, loc);
-               else
- #endif
-               if (c >= L'0' && c <= L'9')
-@@ -120,3 +123,10 @@ noconv:
-               *endptr = (wchar_t *)(any ? s - 1 : nptr);
-       return (acc);
- }
-+
-+uintmax_t
-+wcstoumax(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-+    int base)
-+{
-+      return wcstoumax_l(nptr, endptr, base, __current_locale());
-+}