--- embedaddon/libiconv/lib/tcvn.h 2012/02/21 22:57:48 1.1 +++ embedaddon/libiconv/lib/tcvn.h 2021/03/17 13:38:46 1.1.1.2 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2002, 2004 Free Software Foundation, Inc. + * Copyright (C) 1999-2002, 2004, 2016, 2019 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 . */ /* @@ -78,7 +77,7 @@ static const unsigned short tcvn_2uni_2[128] = { character, or 0 if none. */ static int -tcvn_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) +tcvn_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, size_t n) { unsigned char c = *s; unsigned short wc; @@ -215,10 +214,10 @@ static const unsigned char tcvn_page1e[96] = { }; static int -tcvn_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) +tcvn_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, size_t n) { unsigned char c = 0; - if (wc < 0x0080 && (wc >= 0x0020 || (0x00fe0076 & (1 << wc)) == 0)) { + if (wc < 0x0080 && (wc >= 0x0020 || (0x00fe0076U & (1U << wc)) == 0)) { *r = wc; return 1; }