[BACK]Return to viscii.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libiconv / lib

Diff for /embedaddon/libiconv/lib/viscii.h between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 22:57:48 version 1.1.1.2, 2021/03/17 13:38:46
Line 1 Line 1
 /*  /*
 * Copyright (C) 1999-2001 Free Software Foundation, Inc. * Copyright (C) 1999-2001, 2016, 2019 Free Software Foundation, Inc.
  * This file is part of the GNU LIBICONV Library.   * This file is part of the GNU LIBICONV Library.
  *   *
  * The GNU LIBICONV Library is free software; you can redistribute it   * The GNU LIBICONV Library is free software; you can redistribute it
Line 14 Line 14
  *   *
  * You should have received a copy of the GNU Library General Public   * You should have received a copy of the GNU Library General Public
  * License along with the GNU LIBICONV Library; see the file COPYING.LIB.   * License along with the GNU LIBICONV Library; see the file COPYING.LIB.
 * If not, write to the Free Software Foundation, Inc., 51 Franklin Street, * If not, see <https://www.gnu.org/licenses/>.
 * Fifth Floor, Boston, MA 02110-1301, USA. 
  */   */
   
 /*  /*
Line 60  static const unsigned short viscii_2uni_2[128] = { Line 59  static const unsigned short viscii_2uni_2[128] = {
 };  };
   
 static int  static int
viscii_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)viscii_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, size_t n)
 {  {
   unsigned char c = *s;    unsigned char c = *s;
   if (c < 0x20)    if (c < 0x20)
Line 122  static const unsigned char viscii_page1e[96] = { Line 121  static const unsigned char viscii_page1e[96] = {
 };  };
   
 static int  static int
viscii_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)viscii_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, size_t n)
 {  {
   unsigned char c = 0;    unsigned char c = 0;
  if (wc < 0x0080 && (wc >= 0x0020 || (0x42100064 & (1 << wc)) == 0)) {  if (wc < 0x0080 && (wc >= 0x0020 || (0x42100064U & (1U << wc)) == 0)) {
     *r = wc;      *r = wc;
     return 1;      return 1;
   }    }
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>