Rename u32-mbtouc -> u32-mbtouc-unsafe, u32_mbtouc -> u32_mbtouc_unsafe.

diff --git a/ChangeLog b/ChangeLog
index b0cb92ead3632e2a87101313b8e100e677085b63..c472f4419c3744b89ef842e4280f00e2013c9e5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-27  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        Rename utf16-ucs4 -> utf16-ucs4-unsafe, utf16-ucs4-safe -> utf16-ucs4,

diff --git a/lib/linebreak.c b/lib/linebreak.c
index b9194de9bbb473d7964f6ebd2e6ab270c00aea27..66e4c9455195ec4bd34711e249423ccec0a97840 100644 (file)
--- 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 ba856ecc1281a1a96305bb29d2b9dd48661b292c..d01cee85f8cf905b33a03ef573f878a9cf9027d9 100644 (file)
--- 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;