--- embedaddon/libiconv/lib/gb18030ext.h 2012/05/29 09:29:43 1.1.1.2 +++ embedaddon/libiconv/lib/gb18030ext.h 2021/03/17 13:38:46 1.1.1.3 @@ -1,5 +1,5 @@ /* - * 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. * * The GNU LIBICONV Library is free software; you can redistribute it @@ -14,8 +14,7 @@ * * You should have received a copy of the GNU Library General Public * License along with the GNU LIBICONV Library; see the file COPYING.LIB. - * If not, write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. + * If not, see . */ /* @@ -44,7 +43,7 @@ static const unsigned int gb18030ext_2uni_pagefe[96] = }; 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]; if ((c1 == 0xa2) || (c1 >= 0xa4 && c1 <= 0xa9) || (c1 == 0xd7) || (c1 == 0xfe)) { @@ -242,7 +241,7 @@ static const unsigned short gb18030ext_pagefe[16] = { }; 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) { unsigned short c = 0;