From: Bruno Haible Date: Fri, 3 Jun 2011 01:33:19 +0000 (+0200) Subject: Use u8_mbtoucr instead of u8_mbtouc in some places. X-Git-Tag: v0.18.2~101 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b75a50bc5f30666fb36469a90245e1d7856d672c;p=thirdparty%2Fgettext.git Use u8_mbtoucr instead of u8_mbtouc in some places. --- diff --git a/ChangeLog b/ChangeLog index 9d7650230..13a372985 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-02-12 Bruno Haible + + Use u8_mbtoucr instead of u8_mbtouc in some places. + * autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC, + GNULIB_MODULES_LIBGETTEXTPO): Add unistr/u8-mbtoucr. + 2011-01-28 Bruno Haible Add a comment. diff --git a/autogen.sh b/autogen.sh index 00c1236f2..664ad08b3 100755 --- a/autogen.sh +++ b/autogen.sh @@ -190,6 +190,7 @@ if ! $skip_gnulib; then uniname/uniname unistd unistr/u8-mbtouc + unistr/u8-mbtoucr unistr/u8-uctomb unistr/u16-mbtouc uniwidth/width @@ -282,6 +283,7 @@ if ! $skip_gnulib; then strerror unilbrk/ulc-width-linebreaks unistr/u8-mbtouc + unistr/u8-mbtoucr unistr/u8-uctomb unistr/u16-mbtouc uniwidth/width diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 1de8cc968..41dfb502f 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,11 @@ +2011-06-02 Bruno Haible + + Use u8_mbtoucr instead of u8_mbtouc in some places. + * po-lex.c (mbfile_getc): Call u8_mbtoucr instead of u8_mbtouc. + * x-csharp.c (phase2_getc): Likewise. + * x-python.c (phase2_getc): Likewise. + Needed after libunistring changed on 2010-11-13. + 2011-06-02 Bruno Haible Update after gnulib changed. diff --git a/gettext-tools/src/po-lex.c b/gettext-tools/src/po-lex.c index 98943ec9c..3bf5449b6 100644 --- a/gettext-tools/src/po-lex.c +++ b/gettext-tools/src/po-lex.c @@ -1,5 +1,5 @@ /* GNU gettext - internationalization aids - Copyright (C) 1995-1999, 2000-2009 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000-2009, 2011 Free Software Foundation, Inc. This file was written by Peter Miller . Multibyte character handling by Bruno Haible . @@ -499,7 +499,7 @@ incomplete multibyte sequence at end of line")); if (outbytes == 0) abort (); /* Convert it from UTF-8 to UCS-4. */ - if (u8_mbtouc (&mbc->uc, scratchbuf, outbytes) < outbytes) + if (u8_mbtoucr (&mbc->uc, scratchbuf, outbytes) < (int) outbytes) { /* scratchbuf contains an out-of-range Unicode character (> 0x10ffff). */ diff --git a/gettext-tools/src/x-csharp.c b/gettext-tools/src/x-csharp.c index aaf679429..ffadb0d7b 100644 --- a/gettext-tools/src/x-csharp.c +++ b/gettext-tools/src/x-csharp.c @@ -1,5 +1,5 @@ /* xgettext C# backend. - Copyright (C) 2003, 2005-2009 Free Software Foundation, Inc. + Copyright (C) 2003, 2005-2009, 2011 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software: you can redistribute it and/or modify @@ -330,7 +330,7 @@ Please specify the correct source encoding through --from-code.\n"), while (insize > 0) phase1_ungetc (buf[--insize]); /* Convert the character from UTF-8 to UCS-4. */ - if (u8_mbtouc (&uc, scratchbuf, outbytes) < outbytes) + if (u8_mbtoucr (&uc, scratchbuf, outbytes) < (int) outbytes) { /* scratchbuf contains an out-of-range Unicode character (> 0x10ffff). */ diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c index fcc515044..aa6a7d64c 100644 --- a/gettext-tools/src/x-python.c +++ b/gettext-tools/src/x-python.c @@ -1,5 +1,5 @@ /* xgettext Python backend. - Copyright (C) 2002-2003, 2005-2010 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2011 Free Software Foundation, Inc. This file was written by Bruno Haible , 2002. @@ -347,7 +347,7 @@ comment as specified in http://www.python.org/peps/pep-0263.html.\n"), while (insize > 0) phase1_ungetc (buf[--insize]); /* Convert the character from UTF-8 to UCS-4. */ - if (u8_mbtouc (&uc, scratchbuf, outbytes) < outbytes) + if (u8_mbtoucr (&uc, scratchbuf, outbytes) < (int) outbytes) { /* scratchbuf contains an out-of-range Unicode character (> 0x10ffff). */