Mercurial > hg > octave-kai > gnulib-hg
changeset 8006:64cafdeeb676
Rename utf8-ucs4-safe -> utf8-ucs4, u8_mbtouc_safe -> u8_mbtouc.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 28 Jan 2007 01:49:16 +0000 |
| parents | 0b532fbf5e7a |
| children | 35cd7c8a16c7 |
| files | ChangeLog lib/striconveh.c lib/unistr.h lib/unistr/u8-to-u16.c lib/unistr/u8-to-u32.c modules/striconveh modules/unistr/u8-to-u16 modules/unistr/u8-to-u32 |
| diffstat | 8 files changed, 25 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 2007-01-27 Bruno Haible <bruno@clisp.org> - Rename utf8-ucs4-safe -> utf8-ucs4, utf8-ucs4 -> utf8-ucs4-unsafe, - u8_mbtouc -> u8_mbtouc_unsafe, u8_mbtouc_safe ->u8_mbtouc. + Rename utf8-ucs4 -> utf8-ucs4-unsafe, utf8-ucs4-safe -> utf8-ucs4, + u8_mbtouc -> u8_mbtouc_unsafe, u8_mbtouc_safe -> u8_mbtouc. * modules/utf8-ucs4-unsafe: Renamed from modules/utf8-ucs4. * lib/utf8-ucs4-unsafe.h: Renamed from lib/utf8-ucs4.h. * lib/unistr/utf8-ucs4-unsafe.c: Renamed from lib/unistr/utf8-ucs4.c. @@ -13,6 +13,18 @@ * modules/striconveh: Update. * lib/linebreak.c: Update. * modules/linebreak: Update. + * modules/utf8-ucs4: Renamed from modules/utf8-ucs4-safe. + * lib/utf8-ucs4.h: Renamed from lib/utf8-ucs4-safe.h. + * lib/unistr/utf8-ucs4.c: Renamed from lib/unistr/utf8-ucs4-safe.c. + * modules/unistr/u8-mbtouc: Renamed from modules/unistr/u8-mbtouc-safe. + * lib/unistr/u8-mbtouc.c: Renamed from lib/unistr/u8-mbtouc-safe.c. + * lib/unistr.h: Update. + * lib/striconveh.c: Update. + * modules/striconveh: Update. + * lib/unistr/u8-to-u16.c: Update. + * modules/unistr/u8-to-u16: Update. + * lib/unistr/u8-to-u32.c: Update. + * modules/unistr/u8-to-u32: Update. 2007-01-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
--- a/lib/striconveh.c +++ b/lib/striconveh.c @@ -28,7 +28,7 @@ #if HAVE_ICONV # include <iconv.h> -# include "utf8-ucs4-safe.h" +# include "utf8-ucs4.h" # include "ucs4-utf8.h" # include "unistr.h" #endif @@ -481,7 +481,7 @@ int n; int m; - n = u8_mbtouc_safe (&uc, (const uint8_t *) in1ptr, in1size); + n = u8_mbtouc (&uc, (const uint8_t *) in1ptr, in1size); if (uc == 0xfffd && !(n >= 3 && (uint8_t)in1ptr[0] == 0xEF
--- a/lib/unistr.h +++ b/lib/unistr.h @@ -174,12 +174,12 @@ # endif #endif -#ifdef GNULIB_UNISTR_U8_MBTOUC_SAFE +#ifdef GNULIB_UNISTR_U8_MBTOUC # if !HAVE_INLINE extern int - u8_mbtouc_safe (ucs4_t *puc, const uint8_t *s, size_t n); + u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n); # else -# include "utf8-ucs4-safe.h" +# include "utf8-ucs4.h" # endif #endif
--- a/lib/unistr/u8-to-u16.c +++ b/lib/unistr/u8-to-u16.c @@ -60,7 +60,7 @@ int count; /* Fetch a Unicode character from the input string. */ - count = u8_mbtouc_safe (&uc, s, s_end - s); + count = u8_mbtouc (&uc, s, s_end - s); if (count < 0) { if (!(result == resultbuf || result == NULL))
--- a/lib/unistr/u8-to-u32.c +++ b/lib/unistr/u8-to-u32.c @@ -1,5 +1,5 @@ /* Convert UTF-8 string to UTF-32 string. - Copyright (C) 2002, 2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This program is free software; you can redistribute it and/or modify it @@ -60,7 +60,7 @@ int count; /* Fetch a Unicode character from the input string. */ - count = u8_mbtouc_safe (&uc, s, s_end - s); + count = u8_mbtouc (&uc, s, s_end - s); if (count < 0) { if (!(result == resultbuf || result == NULL))
--- a/modules/striconveh +++ b/modules/striconveh @@ -8,7 +8,7 @@ Depends-on: stdbool iconv -utf8-ucs4-safe +utf8-ucs4 ucs4-utf8 unistr/u8-prev unistr/u8-mbtouc-unsafe