Mercurial > hg > octave-lojdl > gnulib-hg
changeset 8028:76b4eb82b581
Rename utf16-ucs4-safe -> utf16-ucs4, u16_mbtouc_safe -> u16_mbtouc.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 28 Jan 2007 02:20:32 +0000 |
| parents | 3d055a202e0e |
| children | c8ca097c10b9 |
| files | ChangeLog lib/unistr.h lib/unistr/u16-to-u32.c lib/unistr/u16-to-u8.c modules/unistr/u16-to-u32 modules/unistr/u16-to-u8 |
| diffstat | 6 files changed, 19 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,17 @@ * lib/unistr.h: Update. * lib/linebreak.c: Update. * modules/linebreak: Update. + * modules/utf16-ucs4: Renamed from modules/utf16-ucs4-safe. + * lib/utf16-ucs4.h: Renamed from lib/utf16-ucs4-safe.h. + * lib/unistr/utf16-ucs4.c: Renamed from lib/unistr/utf16-ucs4-safe.c. + * modules/unistr/u16-mbtouc: Renamed from + modules/unistr/u16-mbtouc-safe. + * lib/unistr/u16-mbtouc.c: Renamed from lib/unistr/u16-mbtouc-safe.c. + * lib/unistr.h: Update. + * lib/unistr/u16-to-u8.c: Update. + * modules/unistr/u16-to-u8: Update. + * lib/unistr/u16-to-u32.c: Update. + * modules/unistr/u16-to-u32: Update. 2007-01-27 Bruno Haible <bruno@clisp.org>
--- a/lib/unistr.h +++ b/lib/unistr.h @@ -183,12 +183,12 @@ # endif #endif -#ifdef GNULIB_UNISTR_U16_MBTOUC_SAFE +#ifdef GNULIB_UNISTR_U16_MBTOUC # if !HAVE_INLINE extern int - u16_mbtouc_safe (ucs4_t *puc, const uint16_t *s, size_t n); + u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n); # else -# include "utf16-ucs4-safe.h" +# include "utf16-ucs4.h" # endif #endif
--- a/lib/unistr/u16-to-u32.c +++ b/lib/unistr/u16-to-u32.c @@ -1,5 +1,5 @@ /* Convert UTF-16 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 = u16_mbtouc_safe (&uc, s, s_end - s); + count = u16_mbtouc (&uc, s, s_end - s); if (count < 0) { if (!(result == resultbuf || result == NULL))
--- a/lib/unistr/u16-to-u8.c +++ b/lib/unistr/u16-to-u8.c @@ -60,7 +60,7 @@ int count; /* Fetch a Unicode character from the input string. */ - count = u16_mbtouc_safe (&uc, s, s_end - s); + count = u16_mbtouc (&uc, s, s_end - s); if (count < 0) { if (!(result == resultbuf || result == NULL))