# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1169952143 0
# Node ID 476e04edf8c6e938546f5ffe1991dc1041dbb401
# Parent  30dc9ade7f7091d8b02102df02b100a5d25f3d87
Rename u32-mbtouc-safe -> u32-mbtouc, u32_mbtouc_safe -> u32_mbtouc.

diff --git a/ChangeLog b/ChangeLog
--- 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
--- a/lib/unistr.h
+++ b/lib/unistr.h
@@ -192,13 +192,13 @@
 # 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
--- a/lib/unistr/u32-to-u16.c
+++ b/lib/unistr/u32-to-u16.c
@@ -61,7 +61,7 @@
 
       /* 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
--- a/lib/unistr/u32-to-u8.c
+++ b/lib/unistr/u32-to-u8.c
@@ -61,7 +61,7 @@
 
       /* 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.  */