--- embedaddon/libiconv/lib/isoir165.h 2012/02/21 22:57:48 1.1.1.1 +++ embedaddon/libiconv/lib/isoir165.h 2021/03/17 13:38:46 1.1.1.2 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2001, 2005 Free Software Foundation, Inc. + * Copyright (C) 1999-2001, 2005, 2012, 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 . */ /* @@ -81,7 +80,7 @@ #include "isoir165ext.h" static int -isoir165_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n) +isoir165_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, size_t n) { int ret; @@ -108,7 +107,7 @@ isoir165_mbtowc (conv_t conv, ucs4_t *pwc, const unsig if (n >= 2) { unsigned char c2 = s[1]; if (c2 >= 0x21 && c2 < 0x7f) { - int ret = iso646_cn_mbtowc(conv,pwc,s+1,1); + ret = iso646_cn_mbtowc(conv,pwc,s+1,1); if (ret != 1) abort(); return 2; } @@ -122,7 +121,7 @@ isoir165_mbtowc (conv_t conv, ucs4_t *pwc, const unsig } static int -isoir165_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) +isoir165_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, size_t n) { unsigned char buf[2]; int ret;