Libc-763.11.tar.gz

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

diff --git a/locale/FreeBSD/gbk.c.patch b/locale/FreeBSD/gbk.c.patch
index 71081d5507e63873e9c35c0bdd8bfb9f9da809e5..df897652f6e3dd215d6f955ed92d64b9cb26cb0e 100644 (file)
--- a/locale/FreeBSD/gbk.c.patch
+++ b/locale/FreeBSD/gbk.c.patch
@@ -1,28 +1,28 @@
---- gbk.c.orig Thu Nov 25 11:38:17 2004
-+++ gbk.c      Fri Feb 18 15:46:58 2005
-@@ -38,6 +38,8 @@
- #include <sys/param.h>
- __FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.11 2004/05/17 11:16:14 tjr Exp $");
+--- gbk.c.orig 2009-11-09 15:05:25.000000000 -0800
++++ gbk.c      2009-11-09 16:27:30.000000000 -0800
+@@ -34,6 +34,8 @@
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.14 2007/10/13 16:28:21 ache Exp $");
  
 +#include "xlocale_private.h"
 +
+ #include <sys/types.h>
  #include <errno.h>
  #include <runetype.h>
- #include <stdlib.h>
-@@ -45,30 +47,29 @@
+@@ -42,33 +44,30 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/
  #include <wchar.h>
  #include "mblocal.h"
  
--int   _GBK_init(_RuneLocale *);
--size_t        _GBK_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
--          mbstate_t * __restrict);
--int   _GBK_mbsinit(const mbstate_t *);
--size_t        _GBK_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
-+__private_extern__ int        _GBK_init(struct __xlocale_st_runelocale *);
-+static size_t _GBK_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
-+          mbstate_t * __restrict, locale_t);
+-extern int __mb_sb_limit;
+-
+ static size_t _GBK_mbrtowc(wchar_t * __restrict, const char * __restrict,
+-                  size_t, mbstate_t * __restrict);
+-static int    _GBK_mbsinit(const mbstate_t *);
++                  size_t, mbstate_t * __restrict, locale_t);
 +static int    _GBK_mbsinit(const mbstate_t *, locale_t);
-+static size_t _GBK_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict, locale_t);
+ static size_t _GBK_wcrtomb(char * __restrict, wchar_t,
+-                  mbstate_t * __restrict);
++                  mbstate_t * __restrict, locale_t);
  
  typedef struct {
        wchar_t ch;
@@ -39,40 +39,36 @@
 -      __mbsinit = _GBK_mbsinit;
 -      _CurrentRuneLocale = rl;
 -      __mb_cur_max = 2;
+-      __mb_sb_limit = 128;
 +      xrl->__mbrtowc = _GBK_mbrtowc;
 +      xrl->__wcrtomb = _GBK_wcrtomb;
 +      xrl->__mbsinit = _GBK_mbsinit;
 +      xrl->__mb_cur_max = 2;
++      xrl->__mb_sb_limit = 128;
        return (0);
  }
  
--int
+ static int
 -_GBK_mbsinit(const mbstate_t *ps)
-+static int
-+_GBK_mbsinit(const mbstate_t *ps, locale_t loc)
++_GBK_mbsinit(const mbstate_t *ps, locale_t loc __unused)
  {
  
        return (ps == NULL || ((const _GBKState *)ps)->ch == 0);
-@@ -82,9 +83,9 @@
-       return ((c >= 0x81 && c <= 0xfe) ? 2 : 1);
- }
+@@ -84,7 +83,7 @@ _gbk_check(u_int c)
  
--size_t
-+static size_t
+ static size_t
  _GBK_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
 -    mbstate_t * __restrict ps)
-+    mbstate_t * __restrict ps, locale_t loc)
++    mbstate_t * __restrict ps, locale_t loc __unused)
  {
        _GBKState *gs;
        wchar_t wc;
-@@ -143,8 +144,8 @@
-       }
+@@ -144,7 +143,7 @@ _GBK_mbrtowc(wchar_t * __restrict pwc, c
  }
  
--size_t
+ static size_t
 -_GBK_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-+static size_t
-+_GBK_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps, locale_t loc)
++_GBK_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps, locale_t loc __unused)
  {
        _GBKState *gs;