Mercurial > hg > octave-nkf > gnulib-hg
changeset 8017:08f122560c4f
Rename utf16-ucs4 -> utf16-ucs4-unsafe, u16_mbtouc -> u16_mbtouc_unsafe.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 28 Jan 2007 02:04:41 +0000 |
| parents | 15446e82b36a |
| children | 52a55c4e9f79 |
| files | ChangeLog lib/linebreak.c lib/unistr.h modules/linebreak |
| diffstat | 4 files changed, 22 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2007-01-27 Bruno Haible <bruno@clisp.org> + + Rename utf16-ucs4 -> utf16-ucs4-unsafe, utf16-ucs4-safe -> utf16-ucs4, + u16_mbtouc -> u16_mbtouc_unsafe, u16_mbtouc_safe -> u16_mbtouc. + * modules/utf16-ucs4-unsafe: Renamed from modules/utf16-ucs4. + * lib/utf16-ucs4-unsafe.h: Renamed from lib/utf16-ucs4.h. + * lib/unistr/utf16-ucs4-unsafe.c: Renamed from lib/unistr/utf16-ucs4.c. + * modules/unistr/u16-mbtouc-unsafe: Renamed from + modules/unistr/u16-mbtouc. + * lib/unistr/u16-mbtouc-unsafe.c: Renamed from lib/unistr/u16-mbtouc.c. + * lib/unistr.h: Update. + * lib/linebreak.c: Update. + * modules/linebreak: Update. + 2007-01-27 Bruno Haible <bruno@clisp.org> Rename utf8-ucs4 -> utf8-ucs4-unsafe, utf8-ucs4-safe -> utf8-ucs4,
--- a/lib/linebreak.c +++ b/lib/linebreak.c @@ -28,7 +28,7 @@ #include "utf8-ucs4-unsafe.h" -#include "utf16-ucs4.h" +#include "utf16-ucs4-unsafe.h" #ifdef unused static inline int @@ -496,7 +496,7 @@ unsigned int uc; int w; - s += u16_mbtouc (&uc, s, s_end - s); + s += u16_mbtouc_unsafe (&uc, s, s_end - s); if (uc == 0) break; /* end of string reached */ @@ -754,7 +754,7 @@ while (s < s_end) { unsigned int uc; - int count = u16_mbtouc (&uc, s, s_end - s); + int count = u16_mbtouc_unsafe (&uc, s, s_end - s); int prop = lbrkprop_lookup (uc); if (prop == LBP_BK) @@ -1067,7 +1067,7 @@ while (s < s_end) { unsigned int uc; - int count = u16_mbtouc (&uc, s, s_end - s); + int count = u16_mbtouc_unsafe (&uc, s, s_end - s); /* Respect the override. */ if (o != NULL && *o != UC_BREAK_UNDEFINED)
--- a/lib/unistr.h +++ b/lib/unistr.h @@ -141,12 +141,12 @@ # endif #endif -#ifdef GNULIB_UNISTR_U16_MBTOUC +#ifdef GNULIB_UNISTR_U16_MBTOUC_UNSAFE # if !HAVE_INLINE extern int - u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n); + u16_mbtouc_unsafe (ucs4_t *puc, const uint16_t *s, size_t n); # else -# include "utf16-ucs4.h" +# include "utf16-ucs4-unsafe.h" # endif #endif