From 52e249b8efbe72997e8be062f5493c7c3fc3e342 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 28 Jan 2007 02:30:19 +0000 Subject: [PATCH] Rename u32-mbtouc -> u32-mbtouc-unsafe, u32_mbtouc -> u32_mbtouc_unsafe. --- ChangeLog | 9 +++++++++ lib/linebreak.c | 2 +- lib/unistr.h | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0cb92ead..c472f4419 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2007-01-27 Bruno Haible + Rename u32-mbtouc -> u32-mbtouc-unsafe, u32-mbtouc-safe -> u32-mbtouc, + u32_mbtouc -> u32_mbtouc_unsafe, u32_mbtouc_safe -> u32_mbtouc. + * modules/unistr/u32-mbtouc-unsafe: Renamed from + modules/unistr/u32-mbtouc. + * lib/unistr/u32-mbtouc-unsafe.c: Renamed from lib/unistr/u32-mbtouc.c. + * lib/unistr.h: Update. + +2007-01-27 Bruno Haible + 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. diff --git a/lib/linebreak.c b/lib/linebreak.c index b9194de9b..66e4c9455 100644 --- a/lib/linebreak.c +++ b/lib/linebreak.c @@ -32,7 +32,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef unused static inline int -u32_mbtouc (unsigned int *puc, const unsigned int *s, size_t n) +u32_mbtouc_unsafe (unsigned int *puc, const unsigned int *s, size_t n) { *puc = *s; return 1; diff --git a/lib/unistr.h b/lib/unistr.h index ba856ecc1..d01cee85f 100644 --- a/lib/unistr.h +++ b/lib/unistr.h @@ -150,13 +150,13 @@ extern int # endif #endif -#ifdef GNULIB_UNISTR_U32_MBTOUC +#ifdef GNULIB_UNISTR_U32_MBTOUC_UNSAFE # if !HAVE_INLINE extern int - u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n); + u32_mbtouc_unsafe (ucs4_t *puc, const uint32_t *s, size_t n); # else static inline int -u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n) +u32_mbtouc_unsafe (ucs4_t *puc, const uint32_t *s, size_t n) { uint32_t c = *s; -- 2.11.0