Rename u8_mbtouc -> u8_mbtouc_unsafe.

diff --git a/ChangeLog b/ChangeLog
index 93ba5d7627bd80abbe425456def1e16dd143aeb3..437cd5a2724e1e5369bf3c3616f10375caa17e6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-01-27  Bruno Haible  <bruno@clisp.org>
+
+       Rename utf8-ucs4-safe -> utf8-ucs4, utf8-ucs4 -> utf8-ucs4-unsafe,
+       u8_mbtouc -> u8_mbtouc_unsafe, u8_mbtouc_safe ->u8_mbtouc.
+       * modules/utf8-ucs4-unsafe: Renamed from modules/utf8-ucs4.
+       * lib/utf8-ucs4-unsafe.h: Renamed from lib/utf8-ucs4.h.
+       * lib/unistr/utf8-ucs4-unsafe.c: Renamed from lib/unistr/utf8-ucs4.c.
+       * modules/unistr/u8-mbtouc-unsafe: Renamed from
+       modules/unistr/u8-mbtouc.
+       * lib/unistr/u8-mbtouc-unsafe.c: Renamed from lib/unistr/u8-mbtouc.c.
+       * lib/unistr.h: Update.
+       * lib/striconveh.c: Update.
+       * modules/striconveh: Update.
+       * lib/linebreak.c: Update.
+       * modules/linebreak: Update.
+
 2007-01-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Sync from Libtool.

diff --git a/lib/linebreak.c b/lib/linebreak.c
index 09f110cf190a09a15515e250e6246f2699cab502..0ad46681ef3038ca914e5fe06afeb42f83251723 100644 (file)
--- a/lib/linebreak.c
+++ b/lib/linebreak.c
@@ -1,5 +1,5 @@
 /* linebreak.c - line breaking of Unicode strings
-   Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
 This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 #include "c-ctype.h"
 #include "xsize.h"
 
-#include "utf8-ucs4.h"
+#include "utf8-ucs4-unsafe.h"
 
 #include "utf16-ucs4.h"
 
@@ -472,7 +472,7 @@ u8_width (const unsigned char *s, size_t n, const char *encoding)
       unsigned int uc;
       int w;
 
-      s += u8_mbtouc (&uc, s, s_end - s);
+      s += u8_mbtouc_unsafe (&uc, s, s_end - s);
 
       if (uc == 0)
         break; /* end of string reached */
@@ -642,7 +642,7 @@ u8_possible_linebreaks (const unsigned char *s, size_t n, const char *encoding,
   while (s < s_end)
     {
       unsigned int uc;
-      int count = u8_mbtouc (&uc, s, s_end - s);
+      int count = u8_mbtouc_unsafe (&uc, s, s_end - s);
       int prop = lbrkprop_lookup (uc);
 
       if (prop == LBP_BK)
@@ -983,7 +983,7 @@ u8_width_linebreaks (const unsigned char *s, size_t n,
   while (s < s_end)
     {
       unsigned int uc;
-      int count = u8_mbtouc (&uc, s, s_end - s);
+      int count = u8_mbtouc_unsafe (&uc, s, s_end - s);
 
       /* Respect the override.  */
       if (o != NULL && *o != UC_BREAK_UNDEFINED)

diff --git a/lib/striconveh.c b/lib/striconveh.c
index 167ac92afcff7f03dddd19d1e0645e41af747347..1324da5a0de1b2d9657b2109980bfdf365e6b0a5 100644 (file)
--- a/lib/striconveh.c
+++ b/lib/striconveh.c
@@ -643,8 +643,8 @@ mem_cd_iconveh_internal (const char *src, size_t srclen,
                            int n;
                            if (in2size == 0)
                              abort ();
-                           n = u8_mbtouc (&uc, (const uint8_t *) in2ptr,
-                                          in2size);
+                           n = u8_mbtouc_unsafe (&uc, (const uint8_t *) in2ptr,
+                                                 in2size);
                            in2ptr += n;
                            in2size -= n;
                          }

diff --git a/lib/unistr.h b/lib/unistr.h
index e871cb1b9911226d460bd7a5478a915bf982ea5e..a67e5939d5a9c5cf417eb40f39efa94ec5b49697 100644 (file)
--- a/lib/unistr.h
+++ b/lib/unistr.h
@@ -132,12 +132,12 @@ extern int
 /* The variants with _safe suffix are safe, even if the library is compiled
    without --enable-safety.  */
 
-#ifdef GNULIB_UNISTR_U8_MBTOUC
+#ifdef GNULIB_UNISTR_U8_MBTOUC_UNSAFE
 # if !HAVE_INLINE
 extern int
-       u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n);
+       u8_mbtouc_unsafe (ucs4_t *puc, const uint8_t *s, size_t n);
 # else
-#  include "utf8-ucs4.h"
+#  include "utf8-ucs4-unsafe.h"
 # endif
 #endif
 

diff --git a/modules/linebreak b/modules/linebreak
index eef952b0129e65a1fbcc0d97eec987b62f5dbee8..701447de8029753b53fed8ccf5e7906233cbb37a 100644 (file)
--- a/modules/linebreak
+++ b/modules/linebreak
@@ -11,7 +11,7 @@ Depends-on:
 localcharset
 c-ctype
 iconv
-utf8-ucs4
+utf8-ucs4-unsafe
 utf16-ucs4
 xsize
 

diff --git a/modules/striconveh b/modules/striconveh
index 0aeca22a518f005107dcb87d156282ac719b49b4..db375aa3c4a4de2cc1cccfa7f72c13990f681fc3 100644 (file)
--- a/modules/striconveh
+++ b/modules/striconveh
@@ -11,7 +11,7 @@ iconv
 utf8-ucs4-safe
 ucs4-utf8
 unistr/u8-prev
-unistr/u8-mbtouc
+unistr/u8-mbtouc-unsafe
 strdup
 c-strcase
 c-strcaseeq