locale/FreeBSD/none.c.patch

   1 --- none.c.orig 2009-11-09 18:24:17.000000000 -0800
   2 +++ none.c      2009-11-10 11:08:33.000000000 -0800
   3 @@ -37,6 +37,8 @@ static char sccsid[] = "@(#)none.c    8.1 (
   4  #include <sys/cdefs.h>
   5  __FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.15 2007/10/13 16:28:22 ache Exp $");
   6
   7 +#include "xlocale_private.h"
   8 +
   9  #include <errno.h>
  10  #include <limits.h>
  11  #include <runetype.h>
  12 @@ -47,39 +49,27 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/
  13  #include <wchar.h>
  14  #include "mblocal.h"
  15
  16 -static size_t  _none_mbrtowc(wchar_t * __restrict, const char * __restrict,
  17 -                   size_t, mbstate_t * __restrict);
  18 -static int     _none_mbsinit(const mbstate_t *);
  19 -static size_t  _none_mbsnrtowcs(wchar_t * __restrict dst,
  20 -                   const char ** __restrict src, size_t nms, size_t len,
  21 -                   mbstate_t * __restrict ps __unused);
  22 -static size_t  _none_wcrtomb(char * __restrict, wchar_t,
  23 -                   mbstate_t * __restrict);
  24 -static size_t  _none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
  25 -                   size_t, size_t, mbstate_t * __restrict);
  26 -
  27  /* setup defaults */
  28
  29  int __mb_cur_max = 1;
  30  int __mb_sb_limit = 256; /* Expected to be <= _CACHED_RUNES */
  31
  32 -int
  33 -_none_init(_RuneLocale *rl)
  34 +__private_extern__ int
  35 +_none_init(struct __xlocale_st_runelocale *xrl)
  36  {
  37
  38 -       __mbrtowc = _none_mbrtowc;
  39 -       __mbsinit = _none_mbsinit;
  40 -       __mbsnrtowcs = _none_mbsnrtowcs;
  41 -       __wcrtomb = _none_wcrtomb;
  42 -       __wcsnrtombs = _none_wcsnrtombs;
  43 -       _CurrentRuneLocale = rl;
  44 -       __mb_cur_max = 1;
  45 -       __mb_sb_limit = 256;
  46 +       xrl->__mbrtowc = _none_mbrtowc;
  47 +       xrl->__mbsinit = _none_mbsinit;
  48 +       xrl->__mbsnrtowcs = _none_mbsnrtowcs;
  49 +       xrl->__wcrtomb = _none_wcrtomb;
  50 +       xrl->__wcsnrtombs = _none_wcsnrtombs;
  51 +       xrl->__mb_cur_max = 1;
  52 +       xrl->__mb_sb_limit = 256;
  53         return(0);
  54  }
  55
  56 -static int
  57 -_none_mbsinit(const mbstate_t *ps __unused)
  58 +__private_extern__ int
  59 +_none_mbsinit(const mbstate_t *ps __unused, locale_t loc __unused)
  60  {
  61
  62         /*
  63 @@ -89,9 +79,9 @@ _none_mbsinit(const mbstate_t *ps __unus
  64         return (1);
  65  }
  66
  67 -static size_t
  68 +__private_extern__ size_t
  69  _none_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
  70 -    mbstate_t * __restrict ps __unused)
  71 +    mbstate_t * __restrict ps __unused, locale_t loc __unused)
  72  {
  73
  74         if (s == NULL)
  75 @@ -105,9 +95,9 @@ _none_mbrtowc(wchar_t * __restrict pwc,
  76         return (*s == '\0' ? 0 : 1);
  77  }
  78
  79 -static size_t
  80 +__private_extern__ size_t
  81  _none_wcrtomb(char * __restrict s, wchar_t wc,
  82 -    mbstate_t * __restrict ps __unused)
  83 +    mbstate_t * __restrict ps __unused, locale_t loc __unused)
  84  {
  85
  86         if (s == NULL)
  87 @@ -121,9 +111,9 @@ _none_wcrtomb(char * __restrict s, wchar
  88         return (1);
  89  }
  90
  91 -static size_t
  92 +__private_extern__ size_t
  93  _none_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
  94 -    size_t nms, size_t len, mbstate_t * __restrict ps __unused)
  95 +    size_t nms, size_t len, mbstate_t * __restrict ps __unused, locale_t loc __unused)
  96  {
  97         const char *s;
  98         size_t nchr;
  99 @@ -146,9 +136,9 @@ _none_mbsnrtowcs(wchar_t * __restrict ds
 100         return (nchr);
 101  }
 102
 103 -static size_t
 104 +__private_extern__ size_t
 105  _none_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
 106 -    size_t nwc, size_t len, mbstate_t * __restrict ps __unused)
 107 +    size_t nwc, size_t len, mbstate_t * __restrict ps __unused, locale_t loc __unused)
 108  {
 109         const wchar_t *s;
 110         size_t nchr;
 111 @@ -179,16 +169,3 @@ _none_wcsnrtombs(char * __restrict dst,
 112         *src = s;
 113         return (nchr);
 114  }
 115 -
 116 -/* setup defaults */
 117 -
 118 -size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict, size_t,
 119 -    mbstate_t * __restrict) = _none_mbrtowc;
 120 -int (*__mbsinit)(const mbstate_t *) = _none_mbsinit;
 121 -size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict,
 122 -    size_t, size_t, mbstate_t * __restrict) = _none_mbsnrtowcs;
 123 -size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict) =
 124 -    _none_wcrtomb;
 125 -size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict,
 126 -    size_t, size_t, mbstate_t * __restrict) = _none_wcsnrtombs;
 127 -