Rename u32-mbtouc-safe -> u32-mbtouc, u32_mbtouc_safe -> u32_mbtouc.

diff --git a/ChangeLog b/ChangeLog
index c472f4419c3744b89ef842e4280f00e2013c9e5d..78cdfc3cc950a53ce0d25609a5f27ffbbd987273 100644 (file)
--- 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  <bruno@clisp.org>
 

diff --git a/lib/unistr.h b/lib/unistr.h
index d01cee85f8cf905b33a03ef573f878a9cf9027d9..5643ea72b42b26d7ac02916e074dae8ba62b8663 100644 (file)
--- 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 285c9bfbc1f78d22524252b1a20ded37a9a50e0f..1d0bb4d2e3c802521a6dda61a85c9fa9be36aea3 100644 (file)
--- 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 df75b44dcdf4da3dfb29647117ca011e6e93afb0..77371cb015028755e414dc16d7339e48f03115c1 100644 (file)
--- 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.  */