Libc-763.11.tar.gz

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

diff --git a/locale/FreeBSD/gb18030.c.patch b/locale/FreeBSD/gb18030.c.patch
index de83cc1e997a817d6efe4744a9c08ce0d14c6e79..10f81f8d562b8f8cdff6aa422f15c799141a93c9 100644 (file)
--- a/locale/FreeBSD/gb18030.c.patch
+++ b/locale/FreeBSD/gb18030.c.patch
@@ -1,30 +1,29 @@
---- gb18030.c.orig     Thu Nov 25 11:38:16 2004
-+++ gb18030.c  Fri Feb 18 15:43:22 2005
+--- gb18030.c.bsdnew   2009-11-09 15:05:25.000000000 -0800
++++ gb18030.c  2009-11-09 15:50:31.000000000 -0800
 @@ -32,6 +32,8 @@
  #include <sys/param.h>
- __FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.6 2004/05/12 14:09:04 tjr Exp $");
+ __FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.8 2007/10/13 16:28:21 ache Exp $");
  
 +#include "xlocale_private.h"
 +
  #include <errno.h>
  #include <runetype.h>
  #include <stdlib.h>
-@@ -39,40 +41,41 @@
+@@ -39,35 +41,34 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/
  #include <wchar.h>
  #include "mblocal.h"
  
--int   _GB18030_init(_RuneLocale *);
--size_t        _GB18030_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
--          mbstate_t * __restrict);
--int   _GB18030_mbsinit(const mbstate_t *);
--size_t        _GB18030_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
+-extern int __mb_sb_limit;
 +#define GB18030_MB_CUR_MAX    4
-+
-+__private_extern__ int        _GB18030_init(struct __xlocale_st_runelocale *);
-+static size_t _GB18030_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
-+          mbstate_t * __restrict, locale_t);
+ 
+ static size_t _GB18030_mbrtowc(wchar_t * __restrict, const char * __restrict,
+-                  size_t, mbstate_t * __restrict);
+-static int    _GB18030_mbsinit(const mbstate_t *);
++                  size_t, mbstate_t * __restrict, locale_t);
 +static int    _GB18030_mbsinit(const mbstate_t *, locale_t);
-+static size_t _GB18030_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict, locale_t);
+ static size_t _GB18030_wcrtomb(char * __restrict, wchar_t,
+-                  mbstate_t * __restrict);
++                  mbstate_t * __restrict, locale_t);
  
  typedef struct {
        int     count;
@@ -42,32 +41,32 @@
 -      __mbsinit = _GB18030_mbsinit;
 -      _CurrentRuneLocale = rl;
 -      __mb_cur_max = 4;
+-      __mb_sb_limit = 128;
 +      xrl->__mbrtowc = _GB18030_mbrtowc;
 +      xrl->__wcrtomb = _GB18030_wcrtomb;
 +      xrl->__mbsinit = _GB18030_mbsinit;
 +      xrl->__mb_cur_max = GB18030_MB_CUR_MAX;
++      xrl->__mb_sb_limit = 128;
  
        return (0);
  }
  
--int
+ static int
 -_GB18030_mbsinit(const mbstate_t *ps)
-+static int
-+_GB18030_mbsinit(const mbstate_t *ps, locale_t loc)
++_GB18030_mbsinit(const mbstate_t *ps, locale_t loc __unused)
  {
  
        return (ps == NULL || ((const _GB18030State *)ps)->count == 0);
- }
+@@ -75,7 +76,7 @@ _GB18030_mbsinit(const mbstate_t *ps)
  
--size_t
-+static size_t
+ static size_t
  _GB18030_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
 -    size_t n, mbstate_t * __restrict ps)
-+    size_t n, mbstate_t * __restrict ps, locale_t loc)
++    size_t n, mbstate_t * __restrict ps, locale_t loc __unused)
  {
        _GB18030State *gs;
        wchar_t wch;
-@@ -92,7 +95,7 @@
+@@ -95,7 +96,7 @@ _GB18030_mbrtowc(wchar_t * __restrict pw
                pwc = NULL;
        }
  
@@ -76,14 +75,12 @@
        memcpy(gs->bytes + gs->count, s, ncopy);
        ocount = gs->count;
        gs->count += ncopy;
-@@ -154,8 +157,8 @@
-       return ((size_t)-1);
+@@ -158,7 +159,7 @@ ilseq:
  }
  
--size_t
+ static size_t
 -_GB18030_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-+static size_t
-+_GB18030_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps, locale_t loc)
++_GB18030_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps, locale_t loc __unused)
  {
        _GB18030State *gs;
        size_t len;