1 --- big5.c.orig Thu Nov 25 11:38:16 2004
2 +++ big5.c Fri Feb 18 15:48:14 2005
5 __FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.16 2004/05/17 11:16:14 tjr Exp $");
7 +#include "xlocale_private.h"
16 -int _BIG5_init(_RuneLocale *);
17 -size_t _BIG5_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
18 - mbstate_t * __restrict);
19 -int _BIG5_mbsinit(const mbstate_t *);
20 -size_t _BIG5_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
21 +__private_extern__ int _BIG5_init(struct __xlocale_st_runelocale *);
22 +static size_t _BIG5_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
23 + mbstate_t * __restrict, locale_t);
24 +static int _BIG5_mbsinit(const mbstate_t *, locale_t);
25 +static size_t _BIG5_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict, locale_t);
32 -_BIG5_init(_RuneLocale *rl)
33 +__private_extern__ int
34 +_BIG5_init(struct __xlocale_st_runelocale *xrl)
37 - __mbrtowc = _BIG5_mbrtowc;
38 - __wcrtomb = _BIG5_wcrtomb;
39 - __mbsinit = _BIG5_mbsinit;
40 - _CurrentRuneLocale = rl;
42 + xrl->__mbrtowc = _BIG5_mbrtowc;
43 + xrl->__wcrtomb = _BIG5_wcrtomb;
44 + xrl->__mbsinit = _BIG5_mbsinit;
45 + xrl->__mb_cur_max = 2;
50 -_BIG5_mbsinit(const mbstate_t *ps)
52 +_BIG5_mbsinit(const mbstate_t *ps, locale_t loc)
55 return (ps == NULL || ((const _BIG5State *)ps)->ch == 0);
57 return ((c >= 0xa1 && c <= 0xfe) ? 2 : 1);
62 _BIG5_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
63 - mbstate_t * __restrict ps)
64 + mbstate_t * __restrict ps, locale_t loc)
73 -_BIG5_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
75 +_BIG5_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps, locale_t loc)