From 2d92c4fc77ddf2ccb407258878a62b917b67fbfd Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 28 Jan 2007 02:42:23 +0000 Subject: [PATCH] Rename u32-mbtouc-safe -> u32-mbtouc, u32_mbtouc_safe -> u32_mbtouc. --- ChangeLog | 7 +++++++ lib/unistr.h | 6 +++--- lib/unistr/u32-to-u16.c | 2 +- lib/unistr/u32-to-u8.c | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c472f4419c..78cdfc3cc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,13 @@ modules/unistr/u32-mbtouc. * lib/unistr/u32-mbtouc-unsafe.c: Renamed from lib/unistr/u32-mbtouc.c. * lib/unistr.h: Update. + * lib/linebreak.c: Update. + * modules/unistr/u32-mbtouc: Renamed from + modules/unistr/u32-mbtouc-safe. + * lib/unistr/u32-mbtouc.c: Renamed from lib/unistr/u32-mbtouc-safe.c. + * lib/unistr.h: Update. + * lib/unistr/u32-to-u8.c: Update. + * lib/unistr/u32-to-u16.c: Update. 2007-01-27 Bruno Haible diff --git a/lib/unistr.h b/lib/unistr.h index d01cee85f8..5643ea72b4 100644 --- a/lib/unistr.h +++ b/lib/unistr.h @@ -192,13 +192,13 @@ extern int # endif #endif -#ifdef GNULIB_UNISTR_U32_MBTOUC_SAFE +#ifdef GNULIB_UNISTR_U32_MBTOUC # if !HAVE_INLINE extern int - u32_mbtouc_safe (ucs4_t *puc, const uint32_t *s, size_t n); + u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n); # else static inline int -u32_mbtouc_safe (ucs4_t *puc, const uint32_t *s, size_t n) +u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n) { uint32_t c = *s; diff --git a/lib/unistr/u32-to-u16.c b/lib/unistr/u32-to-u16.c index 285c9bfbc1..1d0bb4d2e3 100644 --- a/lib/unistr/u32-to-u16.c +++ b/lib/unistr/u32-to-u16.c @@ -61,7 +61,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf, size_t *lengthp) /* Fetch a Unicode character from the input string. */ uc = *s++; - /* No need to call the safe variant u32_mbtouc_safe, because + /* No need to call the safe variant u32_mbtouc, because u16_uctomb will verify uc anyway. */ /* Store it in the output string. */ diff --git a/lib/unistr/u32-to-u8.c b/lib/unistr/u32-to-u8.c index df75b44dcd..77371cb015 100644 --- a/lib/unistr/u32-to-u8.c +++ b/lib/unistr/u32-to-u8.c @@ -61,7 +61,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf, size_t *lengthp) /* Fetch a Unicode character from the input string. */ uc = *s++; - /* No need to call the safe variant u32_mbtouc_safe, because + /* No need to call the safe variant u32_mbtouc, because u8_uctomb will verify uc anyway. */ /* Store it in the output string. */ -- 2.30.2