--- embedaddon/libiconv/lib/cp936ext.h 2012/02/21 22:57:48 1.1.1.1 +++ embedaddon/libiconv/lib/cp936ext.h 2021/03/17 13:38:46 1.1.1.2 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2001 Free Software Foundation, Inc. + * Copyright (C) 1999-2001, 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 . */ /* @@ -35,7 +34,7 @@ static const unsigned short cp936ext_2uni_pagea8[128-1 }; static int -cp936ext_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) +cp936ext_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, size_t n) { unsigned char c1 = s[0]; if ((c1 == 0xa6) || (c1 == 0xa8)) { @@ -79,7 +78,7 @@ static const unsigned short cp936ext_pagefe[24] = { }; static int -cp936ext_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) +cp936ext_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, size_t n) { if (n >= 2) { unsigned short c = 0;