Libc-997.90.3.tar.gz

[apple/libc.git] / locale / FreeBSD / none.c

diff --git a/locale/FreeBSD/none.c b/locale/FreeBSD/none.c
index 0514bc4632ca75910db731254fc0097152b4a60c..c3c75cf6a4151740ef102fa8c137a0c4cf05dbd7 100644 (file)
--- a/locale/FreeBSD/none.c
+++ b/locale/FreeBSD/none.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.
  * 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.
  * 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.


@@ -39,7 +35,9 @@
 static char sccsid[] = "@(#)none.c     8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 static char sccsid[] = "@(#)none.c     8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.12 2004/07/21 10:54:57 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.15 2007/10/13 16:28:22 ache Exp $");
+
+#include "xlocale_private.h"

 
 #include <errno.h>
 #include <limits.h>
 
 #include <errno.h>
 #include <limits.h>


@@ -51,33 +49,27 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.12 2004/07/21 10:54:57 tjr Ex
 #include <wchar.h>
 #include "mblocal.h"
 
 #include <wchar.h>
 #include "mblocal.h"
 

-int    _none_init(_RuneLocale *);
-size_t _none_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
-           mbstate_t * __restrict);
-int    _none_mbsinit(const mbstate_t *);
-size_t _none_mbsnrtowcs(wchar_t * __restrict dst,
-           const char ** __restrict src, size_t nms, size_t len,
-           mbstate_t * __restrict ps __unused);
-size_t _none_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
-size_t _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
-           size_t, size_t, mbstate_t * __restrict);
-
-int
-_none_init(_RuneLocale *rl)
+/* setup defaults */
+
+int __mb_cur_max = 1;
+int __mb_sb_limit = 256; /* Expected to be <= _CACHED_RUNES */
+
+__private_extern__ int
+_none_init(struct __xlocale_st_runelocale *xrl)

 {
 
 {
 

-       __mbrtowc = _none_mbrtowc;
-       __mbsinit = _none_mbsinit;
-       __mbsnrtowcs = _none_mbsnrtowcs;
-       __wcrtomb = _none_wcrtomb;
-       __wcsnrtombs = _none_wcsnrtombs;
-       _CurrentRuneLocale = rl;
-       __mb_cur_max = 1;
+       xrl->__mbrtowc = _none_mbrtowc;
+       xrl->__mbsinit = _none_mbsinit;
+       xrl->__mbsnrtowcs = _none_mbsnrtowcs;
+       xrl->__wcrtomb = _none_wcrtomb;
+       xrl->__wcsnrtombs = _none_wcsnrtombs;
+       xrl->__mb_cur_max = 1;
+       xrl->__mb_sb_limit = 256;

        return(0);
 }
 
        return(0);
 }
 

-int
-_none_mbsinit(const mbstate_t *ps __unused)
+__private_extern__ int
+_none_mbsinit(const mbstate_t *ps __unused, locale_t loc __unused)

 {
 
        /*
 {
 
        /*


@@ -87,9 +79,9 @@ _none_mbsinit(const mbstate_t *ps __unused)
        return (1);
 }
 
        return (1);
 }
 

-size_t
+__private_extern__ size_t

 _none_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
 _none_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,

-    mbstate_t * __restrict ps __unused)
+    mbstate_t * __restrict ps __unused, locale_t loc __unused)

 {
 
        if (s == NULL)
 {
 
        if (s == NULL)


@@ -103,9 +95,9 @@ _none_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
        return (*s == '\0' ? 0 : 1);
 }
 
        return (*s == '\0' ? 0 : 1);
 }
 

-size_t
+__private_extern__ size_t

 _none_wcrtomb(char * __restrict s, wchar_t wc,
 _none_wcrtomb(char * __restrict s, wchar_t wc,

-    mbstate_t * __restrict ps __unused)
+    mbstate_t * __restrict ps __unused, locale_t loc __unused)

 {
 
        if (s == NULL)
 {
 
        if (s == NULL)


@@ -119,9 +111,9 @@ _none_wcrtomb(char * __restrict s, wchar_t wc,
        return (1);
 }
 
        return (1);
 }
 

-size_t
+__private_extern__ size_t

 _none_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
 _none_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,

-    size_t nms, size_t len, mbstate_t * __restrict ps __unused)
+    size_t nms, size_t len, mbstate_t * __restrict ps __unused, locale_t loc __unused)

 {
        const char *s;
        size_t nchr;
 {
        const char *s;
        size_t nchr;


@@ -144,9 +136,9 @@ _none_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
        return (nchr);
 }
 
        return (nchr);
 }
 

-size_t
+__private_extern__ size_t

 _none_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
 _none_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,

-    size_t nwc, size_t len, mbstate_t * __restrict ps __unused)
+    size_t nwc, size_t len, mbstate_t * __restrict ps __unused, locale_t loc __unused)

 {
        const wchar_t *s;
        size_t nchr;
 {
        const wchar_t *s;
        size_t nchr;