Print this page
2964 need POSIX 2008 locale object support
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Approved by: TBD

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/libc/port/locale/mblocal.h
          +++ new/usr/src/lib/libc/port/locale/mblocal.h
   1    1  /*
        2 + * Copyright 2013 Garrett D'Amore <garrett@damore.org>
   2    3   * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
   3    4   * Copyright (c) 2004 Tim J. Robbins.
   4    5   * All rights reserved.
   5    6   *
   6    7   * Redistribution and use in source and binary forms, with or without
   7    8   * modification, are permitted provided that the following conditions
   8    9   * are met:
   9   10   * 1. Redistributions of source code must retain the above copyright
  10   11   *    notice, this list of conditions and the following disclaimer.
  11   12   * 2. Redistributions in binary form must reproduce the above copyright
↓ open down ↓ 10 lines elided ↑ open up ↑
  22   23   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  23   24   * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  24   25   * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  25   26   * SUCH DAMAGE.
  26   27   */
  27   28  
  28   29  #ifndef _MBLOCAL_H_
  29   30  #define _MBLOCAL_H_
  30   31  
  31   32  #include "runetype.h"
       33 +#include "lctype.h"
  32   34  
  33   35  /*
  34   36   * Rune initialization function prototypes.
  35   37   */
  36      -int     _none_init(_RuneLocale *);
  37      -int     _UTF8_init(_RuneLocale *);
  38      -int     _EUC_CN_init(_RuneLocale *);
  39      -int     _EUC_JP_init(_RuneLocale *);
  40      -int     _EUC_KR_init(_RuneLocale *);
  41      -int     _EUC_TW_init(_RuneLocale *);
  42      -int     _GB18030_init(_RuneLocale *);
  43      -int     _GB2312_init(_RuneLocale *);
  44      -int     _GBK_init(_RuneLocale *);
  45      -int     _BIG5_init(_RuneLocale *);
  46      -int     _MSKanji_init(_RuneLocale *);
       38 +void    _none_init(struct lc_ctype *);
       39 +void    _UTF8_init(struct lc_ctype *);
       40 +void    _EUC_CN_init(struct lc_ctype *);
       41 +void    _EUC_JP_init(struct lc_ctype *);
       42 +void    _EUC_KR_init(struct lc_ctype *);
       43 +void    _EUC_TW_init(struct lc_ctype *);
       44 +void    _GB18030_init(struct lc_ctype *);
       45 +void    _GB2312_init(struct lc_ctype *);
       46 +void    _GBK_init(struct lc_ctype *);
       47 +void    _BIG5_init(struct lc_ctype *);
       48 +void    _MSKanji_init(struct lc_ctype *);
  47   49  
  48      -/*
  49      - * Conversion function pointers for current encoding.
  50      - */
  51      -extern size_t (*__mbrtowc)(wchar_t *_RESTRICT_KYWD,
       50 +typedef size_t (*mbrtowc_pfn_t)(wchar_t *_RESTRICT_KYWD,
  52   51      const char *_RESTRICT_KYWD, size_t, mbstate_t *_RESTRICT_KYWD);
  53      -extern int (*__mbsinit)(const mbstate_t *);
  54      -extern size_t (*__mbsnrtowcs)(wchar_t *_RESTRICT_KYWD,
  55      -    const char **_RESTRICT_KYWD, size_t, size_t, mbstate_t *_RESTRICT_KYWD);
  56      -
  57      -extern size_t (*__wcrtomb)(char *_RESTRICT_KYWD, wchar_t,
       52 +typedef size_t (*wcrtomb_pfn_t)(char *_RESTRICT_KYWD, wchar_t,
  58   53      mbstate_t *_RESTRICT_KYWD);
  59      -
  60      -extern size_t (*__wcsnrtombs)(char *_RESTRICT_KYWD,
  61      -    const wchar_t **_RESTRICT_KYWD, size_t, size_t, mbstate_t *_RESTRICT_KYWD);
  62      -
  63      -extern int charset_is_ascii;
  64      -
  65   54  size_t __mbsnrtowcs_std(wchar_t *_RESTRICT_KYWD, const char **_RESTRICT_KYWD,
  66      -    size_t, size_t, mbstate_t *_RESTRICT_KYWD);
       55 +    size_t, size_t, mbstate_t *_RESTRICT_KYWD, mbrtowc_pfn_t);
  67   56  size_t __wcsnrtombs_std(char *_RESTRICT_KYWD, const wchar_t **_RESTRICT_KYWD,
  68      -    size_t, size_t, mbstate_t *_RESTRICT_KYWD);
       57 +    size_t, size_t, mbstate_t *_RESTRICT_KYWD, wcrtomb_pfn_t);
  69   58  
  70   59  #define MIN(a, b)       ((a) < (b) ? (a) : (b))
  71   60  
  72   61  #endif  /* _MBLOCAL_H_ */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX