Rename utf16-ucs4-safe -> utf16-ucs4, u16_mbtouc_safe -> u16_mbtouc.

diff --git a/ChangeLog b/ChangeLog
index 9c9910c34a4ac3b71cc311ec76c8f9692280d724..b0cb92ead3632e2a87101313b8e100e677085b63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,17 @@
        * lib/unistr.h: Update.
        * lib/linebreak.c: Update.
        * modules/linebreak: Update.
+       * modules/utf16-ucs4: Renamed from modules/utf16-ucs4-safe.
+       * lib/utf16-ucs4.h: Renamed from lib/utf16-ucs4-safe.h.
+       * lib/unistr/utf16-ucs4.c: Renamed from lib/unistr/utf16-ucs4-safe.c.
+       * modules/unistr/u16-mbtouc: Renamed from
+       modules/unistr/u16-mbtouc-safe.
+       * lib/unistr/u16-mbtouc.c: Renamed from lib/unistr/u16-mbtouc-safe.c.
+       * lib/unistr.h: Update.
+       * lib/unistr/u16-to-u8.c: Update.
+       * modules/unistr/u16-to-u8: Update.
+       * lib/unistr/u16-to-u32.c: Update.
+       * modules/unistr/u16-to-u32: Update.
 
 2007-01-27  Bruno Haible  <bruno@clisp.org>
 

diff --git a/lib/unistr.h b/lib/unistr.h
index 79759bc4b9eb66f495635ea5f0487f0de1775608..ba856ecc1281a1a96305bb29d2b9dd48661b292c 100644 (file)
--- a/lib/unistr.h
+++ b/lib/unistr.h
@@ -183,12 +183,12 @@ extern int
 # endif
 #endif
 
-#ifdef GNULIB_UNISTR_U16_MBTOUC_SAFE
+#ifdef GNULIB_UNISTR_U16_MBTOUC
 # if !HAVE_INLINE
 extern int
-       u16_mbtouc_safe (ucs4_t *puc, const uint16_t *s, size_t n);
+       u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n);
 # else
-#  include "utf16-ucs4-safe.h"
+#  include "utf16-ucs4.h"
 # endif
 #endif
 

diff --git a/lib/unistr/u16-to-u32.c b/lib/unistr/u16-to-u32.c
index fa2227afdaa6983eff076e3f4b7923c83ea14d9d..3926deef3919dd64e99e7ac7588a11f7f4a1e3e2 100644 (file)
--- a/lib/unistr/u16-to-u32.c
+++ b/lib/unistr/u16-to-u32.c
@@ -1,5 +1,5 @@
 /* Convert UTF-16 string to UTF-32 string.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software; you can redistribute it and/or modify it
@@ -60,7 +60,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf, size_t *lengthp)
       int count;
 
       /* Fetch a Unicode character from the input string.  */
-      count = u16_mbtouc_safe (&uc, s, s_end - s);
+      count = u16_mbtouc (&uc, s, s_end - s);
       if (count < 0)
        {
          if (!(result == resultbuf || result == NULL))

diff --git a/lib/unistr/u16-to-u8.c b/lib/unistr/u16-to-u8.c
index 484af1ac3fcd9420b0fd23dd13c9d217ff33c2be..fa1b861dff404511184dba76747b2f95213ac781 100644 (file)
--- a/lib/unistr/u16-to-u8.c
+++ b/lib/unistr/u16-to-u8.c
@@ -60,7 +60,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf, size_t *lengthp)
       int count;
 
       /* Fetch a Unicode character from the input string.  */
-      count = u16_mbtouc_safe (&uc, s, s_end - s);
+      count = u16_mbtouc (&uc, s, s_end - s);
       if (count < 0)
        {
          if (!(result == resultbuf || result == NULL))

diff --git a/modules/unistr/u16-to-u32 b/modules/unistr/u16-to-u32
index a77325cad22d8e472abe1aa33e6f0860bf320dd9..399ac89de67949b5ed1ae9f195d852613b73c48c 100644 (file)
--- a/modules/unistr/u16-to-u32
+++ b/modules/unistr/u16-to-u32
@@ -6,7 +6,7 @@ lib/unistr/u16-to-u32.c
 
 Depends-on:
 unistr/base
-unistr/u16-mbtouc-safe
+unistr/u16-mbtouc
 
 configure.ac:
 

diff --git a/modules/unistr/u16-to-u8 b/modules/unistr/u16-to-u8
index 3de0a8b440abf0cce89d6658761c8ab4a4e85040..7fc8dba0039ad33a56c8e60439f126c2ee42eba0 100644 (file)
--- a/modules/unistr/u16-to-u8
+++ b/modules/unistr/u16-to-u8
@@ -6,7 +6,7 @@ lib/unistr/u16-to-u8.c
 
 Depends-on:
 unistr/base
-unistr/u16-mbtouc-safe
+unistr/u16-mbtouc
 unistr/u8-uctomb
 
 configure.ac: