Diff for /embedaddon/libiconv/lib/gb18030ext.h between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2012/05/29 09:29:43 version 1.1.1.3, 2021/03/17 13:38:46
Line 1 Line 1
 /*  /*
 * Copyright (C) 1999-2001, 2005, 2011 Free Software Foundation, Inc. * Copyright (C) 1999-2001, 2005, 2011, 2016 Free Software Foundation, Inc.
  * This file is part of the GNU LIBICONV Library.   * This file is part of the GNU LIBICONV Library.
  *   *
  * The GNU LIBICONV Library is free software; you can redistribute it   * The GNU LIBICONV Library is free software; you can redistribute it
Line 14 Line 14
  *   *
  * You should have received a copy of the GNU Library General Public   * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.   * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
 * If not, write to the Free Software Foundation, Inc., 51 Franklin Street, * If not, see <https://www.gnu.org/licenses/>.
 * Fifth Floor, Boston, MA 02110-1301, USA. 
  */   */
   
 /*  /*
Line 44  static const unsigned int gb18030ext_2uni_pagefe[96] = Line 43  static const unsigned int gb18030ext_2uni_pagefe[96] =
 };  };
   
 static int  static int
gb18030ext_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)gb18030ext_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, size_t n)
 {  {
   unsigned char c1 = s[0];    unsigned char c1 = s[0];
   if ((c1 == 0xa2) || (c1 >= 0xa4 && c1 <= 0xa9) || (c1 == 0xd7) || (c1 == 0xfe)) {    if ((c1 == 0xa2) || (c1 >= 0xa4 && c1 <= 0xa9) || (c1 == 0xd7) || (c1 == 0xfe)) {
Line 242  static const unsigned short gb18030ext_pagefe[16] = { Line 241  static const unsigned short gb18030ext_pagefe[16] = {
 };  };
   
 static int  static int
gb18030ext_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)gb18030ext_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, size_t n)
 {  {
   if (n >= 2) {    if (n >= 2) {
     unsigned short c = 0;      unsigned short c = 0;

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>