--- embedaddon/libiconv/lib/iso2022_jp3.h 2012/02/21 22:57:48 1.1.1.1 +++ embedaddon/libiconv/lib/iso2022_jp3.h 2021/03/17 13:38:46 1.1.1.2 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2004, 2008 Free Software Foundation, Inc. + * Copyright (C) 1999-2004, 2008, 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 . */ /* @@ -42,7 +41,7 @@ */ static int -iso2022_jp3_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) +iso2022_jp3_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, size_t n) { ucs4_t last_wc = conv->istate >> 3; if (last_wc) { @@ -261,7 +260,7 @@ static const struct { unsigned short base; unsigned sh /* assume lasttwo == 0, then prevstate is ignored */ static int -iso2022_jp3_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) +iso2022_jp3_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, size_t n) { int count = 0; unsigned char buf[2]; @@ -495,7 +494,7 @@ iso2022_jp3_wctomb (conv_t conv, unsigned char *r, ucs } static int -iso2022_jp3_reset (conv_t conv, unsigned char *r, int n) +iso2022_jp3_reset (conv_t conv, unsigned char *r, size_t n) { state_t state = conv->ostate; SPLIT_STATE;