X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/1f2f436a38f7ae2d39a943ad2898d8fed4ed2e58..2be56ee90c5c5bee77895b8787a43e894249002b:/locale/FreeBSD/mskanji.c?ds=sidebyside diff --git a/locale/FreeBSD/mskanji.c b/locale/FreeBSD/mskanji.c index 609004d..0b854f3 100644 --- a/locale/FreeBSD/mskanji.c +++ b/locale/FreeBSD/mskanji.c @@ -39,6 +39,8 @@ static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95"; #include __FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.18 2007/10/13 16:28:22 ache Exp $"); +#include "xlocale_private.h" + #include #include #include @@ -47,33 +49,30 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.18 2007/10/13 16:28:22 ach #include #include "mblocal.h" -extern int __mb_sb_limit; - static size_t _MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict, - size_t, mbstate_t * __restrict); -static int _MSKanji_mbsinit(const mbstate_t *); + size_t, mbstate_t * __restrict, locale_t); +static int _MSKanji_mbsinit(const mbstate_t *, locale_t); static size_t _MSKanji_wcrtomb(char * __restrict, wchar_t, - mbstate_t * __restrict); + mbstate_t * __restrict, locale_t); typedef struct { wchar_t ch; } _MSKanjiState; int -_MSKanji_init(_RuneLocale *rl) +_MSKanji_init(struct __xlocale_st_runelocale *xrl) { - __mbrtowc = _MSKanji_mbrtowc; - __wcrtomb = _MSKanji_wcrtomb; - __mbsinit = _MSKanji_mbsinit; - _CurrentRuneLocale = rl; - __mb_cur_max = 2; - __mb_sb_limit = 256; + xrl->__mbrtowc = _MSKanji_mbrtowc; + xrl->__wcrtomb = _MSKanji_wcrtomb; + xrl->__mbsinit = _MSKanji_mbsinit; + xrl->__mb_cur_max = 2; + xrl->__mb_sb_limit = 256; return (0); } static int -_MSKanji_mbsinit(const mbstate_t *ps) +_MSKanji_mbsinit(const mbstate_t *ps, locale_t loc __unused) { return (ps == NULL || ((const _MSKanjiState *)ps)->ch == 0); @@ -81,7 +80,7 @@ _MSKanji_mbsinit(const mbstate_t *ps) static size_t _MSKanji_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n, - mbstate_t * __restrict ps) + mbstate_t * __restrict ps, locale_t loc __unused) { _MSKanjiState *ms; wchar_t wc; @@ -138,7 +137,7 @@ _MSKanji_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n, } static size_t -_MSKanji_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps) +_MSKanji_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps, locale_t loc __unused) { _MSKanjiState *ms; int len, i;