Libc-763.11.tar.gz

[apple/libc.git] / locale / gbk-fbsd.c

diff --git a/locale/gbk-fbsd.c b/locale/gbk-fbsd.c
index a9191374feb8306a687434b3fd972c186e3dc7f2..c38338b1309b89b57075bc66fddcf16d5d5cb4b4 100644 (file)
--- a/locale/gbk-fbsd.c
+++ b/locale/gbk-fbsd.c
@@ -14,10 +14,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -35,11 +31,12 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.11 2004/05/17 11:16:14 tjr Exp $");
+#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>
@@ -47,11 +44,11 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.11 2004/05/17 11:16:14 tjr Exp
 #include <wchar.h>
 #include "mblocal.h"
 
-__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);
+static size_t  _GBK_mbrtowc(wchar_t * __restrict, const char * __restrict,
+                   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, locale_t);
 
 typedef struct {
        wchar_t ch;
@@ -65,11 +62,12 @@ _GBK_init(struct __xlocale_st_runelocale *xrl)
        xrl->__wcrtomb = _GBK_wcrtomb;
        xrl->__mbsinit = _GBK_mbsinit;
        xrl->__mb_cur_max = 2;
+       xrl->__mb_sb_limit = 128;
        return (0);
 }
 
 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);
@@ -85,7 +83,7 @@ _gbk_check(u_int c)
 
 static size_t
 _GBK_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps, locale_t loc)
+    mbstate_t * __restrict ps, locale_t loc __unused)
 {
        _GBKState *gs;
        wchar_t wc;
@@ -145,7 +143,7 @@ _GBK_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
 }
 
 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;