Rename utf16-ucs4 -> utf16-ucs4-unsafe, u16_mbtouc -> u16_mbtouc_unsafe.

diff --git a/ChangeLog b/ChangeLog
index 6872d5a..9c9910c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2007-01-27  Bruno Haible  <bruno@clisp.org>
 
+       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.
+       * lib/utf16-ucs4-unsafe.h: Renamed from lib/utf16-ucs4.h.
+       * lib/unistr/utf16-ucs4-unsafe.c: Renamed from lib/unistr/utf16-ucs4.c.
+       * modules/unistr/u16-mbtouc-unsafe: Renamed from
+       modules/unistr/u16-mbtouc.
+       * lib/unistr/u16-mbtouc-unsafe.c: Renamed from lib/unistr/u16-mbtouc.c.
+       * lib/unistr.h: Update.
+       * lib/linebreak.c: Update.
+       * modules/linebreak: Update.
+
+2007-01-27  Bruno Haible  <bruno@clisp.org>
+
        Rename utf8-ucs4 -> utf8-ucs4-unsafe, utf8-ucs4-safe -> utf8-ucs4,
        u8_mbtouc -> u8_mbtouc_unsafe, u8_mbtouc_safe -> u8_mbtouc.
        * modules/utf8-ucs4-unsafe: Renamed from modules/utf8-ucs4.

diff --git a/lib/linebreak.c b/lib/linebreak.c
index 0ad4668..b9194de 100644 (file)
--- a/lib/linebreak.c
+++ b/lib/linebreak.c
@@ -28,7 +28,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #include "utf8-ucs4-unsafe.h"
 
-#include "utf16-ucs4.h"
+#include "utf16-ucs4-unsafe.h"
 
 #ifdef unused
 static inline int
@@ -496,7 +496,7 @@ u16_width (const unsigned short *s, size_t n, const char *encoding)
       unsigned int uc;
       int w;
 
-      s += u16_mbtouc (&uc, s, s_end - s);
+      s += u16_mbtouc_unsafe (&uc, s, s_end - s);
 
       if (uc == 0)
         break; /* end of string reached */
@@ -754,7 +754,7 @@ u16_possible_linebreaks (const unsigned short *s, size_t n, const char *encoding
   while (s < s_end)
     {
       unsigned int uc;
-      int count = u16_mbtouc (&uc, s, s_end - s);
+      int count = u16_mbtouc_unsafe (&uc, s, s_end - s);
       int prop = lbrkprop_lookup (uc);
 
       if (prop == LBP_BK)
@@ -1067,7 +1067,7 @@ u16_width_linebreaks (const unsigned short *s, size_t n,
   while (s < s_end)
     {
       unsigned int uc;
-      int count = u16_mbtouc (&uc, s, s_end - s);
+      int count = u16_mbtouc_unsafe (&uc, s, s_end - s);
 
       /* Respect the override.  */
       if (o != NULL && *o != UC_BREAK_UNDEFINED)

diff --git a/lib/unistr.h b/lib/unistr.h
index 72b928b..79759bc 100644 (file)
--- a/lib/unistr.h
+++ b/lib/unistr.h
@@ -141,12 +141,12 @@ extern int
 # endif
 #endif
 
-#ifdef GNULIB_UNISTR_U16_MBTOUC
+#ifdef GNULIB_UNISTR_U16_MBTOUC_UNSAFE
 # if !HAVE_INLINE
 extern int
-       u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n);
+       u16_mbtouc_unsafe (ucs4_t *puc, const uint16_t *s, size_t n);
 # else
-#  include "utf16-ucs4.h"
+#  include "utf16-ucs4-unsafe.h"
 # endif
 #endif
 

diff --git a/modules/linebreak b/modules/linebreak
index 701447d..1c43439 100644 (file)
--- a/modules/linebreak
+++ b/modules/linebreak
@@ -12,7 +12,7 @@ localcharset
 c-ctype
 iconv
 utf8-ucs4-unsafe
-utf16-ucs4
+utf16-ucs4-unsafe
 xsize
 
 configure.ac: