locale/FreeBSD/ascii.c.patch

   1 Index: ascii.c
   2 ===================================================================
   3 --- ascii.c     (revision 47445)
   4 +++ ascii.c     (working copy)
   5 @@ -45,33 +45,32 @@
   6  #include "mblocal.h"
   7
   8  static size_t  _ascii_mbrtowc(wchar_t * __restrict, const char * __restrict,
   9 -                   size_t, mbstate_t * __restrict);
  10 -static int     _ascii_mbsinit(const mbstate_t *);
  11 +                   size_t, mbstate_t * __restrict, locale_t);
  12 +static int     _ascii_mbsinit(const mbstate_t *, locale_t);
  13  static size_t  _ascii_mbsnrtowcs(wchar_t * __restrict dst,
  14                     const char ** __restrict src, size_t nms, size_t len,
  15 -                   mbstate_t * __restrict ps __unused);
  16 +                   mbstate_t * __restrict ps __unused, locale_t);
  17  static size_t  _ascii_wcrtomb(char * __restrict, wchar_t,
  18 -                   mbstate_t * __restrict);
  19 +                   mbstate_t * __restrict, locale_t);
  20  static size_t  _ascii_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
  21 -                   size_t, size_t, mbstate_t * __restrict);
  22 +                   size_t, size_t, mbstate_t * __restrict, locale_t);
  23
  24 -int
  25 -_ascii_init(_RuneLocale *rl)
  26 +__private_extern__ int
  27 +_ascii_init(struct __xlocale_st_runelocale *xrl)
  28  {
  29
  30 -       __mbrtowc = _ascii_mbrtowc;
  31 -       __mbsinit = _ascii_mbsinit;
  32 -       __mbsnrtowcs = _ascii_mbsnrtowcs;
  33 -       __wcrtomb = _ascii_wcrtomb;
  34 -       __wcsnrtombs = _ascii_wcsnrtombs;
  35 -       _CurrentRuneLocale = rl;
  36 -       __mb_cur_max = 1;
  37 -       __mb_sb_limit = 128;
  38 +       xrl->__mbrtowc = _ascii_mbrtowc;
  39 +       xrl->__mbsinit = _ascii_mbsinit;
  40 +       xrl->__mbsnrtowcs = _ascii_mbsnrtowcs;
  41 +       xrl->__wcrtomb = _ascii_wcrtomb;
  42 +       xrl->__wcsnrtombs = _ascii_wcsnrtombs;
  43 +       xrl->__mb_cur_max = 1;
  44 +       xrl->__mb_sb_limit = 128;
  45         return(0);
  46  }
  47
  48  static int
  49 -_ascii_mbsinit(const mbstate_t *ps __unused)
  50 +_ascii_mbsinit(const mbstate_t *ps __unused, locale_t loc __unused)
  51  {
  52
  53         /*
  54 @@ -83,7 +82,7 @@
  55
  56  static size_t
  57  _ascii_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
  58 -    mbstate_t * __restrict ps __unused)
  59 +    mbstate_t * __restrict ps __unused, locale_t loc __unused)
  60  {
  61
  62         if (s == NULL)
  63 @@ -103,7 +102,7 @@
  64
  65  static size_t
  66  _ascii_wcrtomb(char * __restrict s, wchar_t wc,
  67 -    mbstate_t * __restrict ps __unused)
  68 +    mbstate_t * __restrict ps __unused, locale_t loc __unused)
  69  {
  70
  71         if (s == NULL)
  72 @@ -119,7 +118,7 @@
  73
  74  static size_t
  75  _ascii_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
  76 -    size_t nms, size_t len, mbstate_t * __restrict ps __unused)
  77 +    size_t nms, size_t len, mbstate_t * __restrict ps __unused, locale_t loc __unused)
  78  {
  79         const char *s;
  80         size_t nchr;
  81 @@ -153,7 +152,7 @@
  82
  83  static size_t
  84  _ascii_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
  85 -    size_t nwc, size_t len, mbstate_t * __restrict ps __unused)
  86 +    size_t nwc, size_t len, mbstate_t * __restrict ps __unused, locale_t loc __unused)
  87  {
  88         const wchar_t *s;
  89         size_t nchr;