diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | lib/striconveh.c | 4 | ||||
| -rw-r--r-- | lib/unistr.h | 6 | ||||
| -rw-r--r-- | lib/unistr/u8-to-u16.c | 2 | ||||
| -rw-r--r-- | lib/unistr/u8-to-u32.c | 4 | ||||
| -rw-r--r-- | modules/striconveh | 2 | ||||
| -rw-r--r-- | modules/unistr/u8-to-u16 | 2 | ||||
| -rw-r--r-- | modules/unistr/u8-to-u32 | 2 |
8 files changed, 25 insertions, 13 deletions
@@ -1,7 +1,7 @@ 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. + 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. * lib/utf8-ucs4-unsafe.h: Renamed from lib/utf8-ucs4.h. * lib/unistr/utf8-ucs4-unsafe.c: Renamed from lib/unistr/utf8-ucs4.c. @@ -13,6 +13,18 @@ * modules/striconveh: Update. * lib/linebreak.c: Update. * modules/linebreak: Update. + * modules/utf8-ucs4: Renamed from modules/utf8-ucs4-safe. + * lib/utf8-ucs4.h: Renamed from lib/utf8-ucs4-safe.h. + * lib/unistr/utf8-ucs4.c: Renamed from lib/unistr/utf8-ucs4-safe.c. + * modules/unistr/u8-mbtouc: Renamed from modules/unistr/u8-mbtouc-safe. + * lib/unistr/u8-mbtouc.c: Renamed from lib/unistr/u8-mbtouc-safe.c. + * lib/unistr.h: Update. + * lib/striconveh.c: Update. + * modules/striconveh: Update. + * lib/unistr/u8-to-u16.c: Update. + * modules/unistr/u8-to-u16: Update. + * lib/unistr/u8-to-u32.c: Update. + * modules/unistr/u8-to-u32: Update. 2007-01-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> diff --git a/lib/striconveh.c b/lib/striconveh.c index 1324da5a0d..56c0c04782 100644 --- a/lib/striconveh.c +++ b/lib/striconveh.c @@ -28,7 +28,7 @@ #if HAVE_ICONV # include <iconv.h> -# include "utf8-ucs4-safe.h" +# include "utf8-ucs4.h" # include "ucs4-utf8.h" # include "unistr.h" #endif @@ -481,7 +481,7 @@ mem_cd_iconveh_internal (const char *src, size_t srclen, int n; int m; - n = u8_mbtouc_safe (&uc, (const uint8_t *) in1ptr, in1size); + n = u8_mbtouc (&uc, (const uint8_t *) in1ptr, in1size); if (uc == 0xfffd && !(n >= 3 && (uint8_t)in1ptr[0] == 0xEF diff --git a/lib/unistr.h b/lib/unistr.h index a67e5939d5..72b928b1b3 100644 --- a/lib/unistr.h +++ b/lib/unistr.h @@ -174,12 +174,12 @@ u32_mbtouc (ucs4_t *puc, const uint32_t *s, size_t n) # endif #endif -#ifdef GNULIB_UNISTR_U8_MBTOUC_SAFE +#ifdef GNULIB_UNISTR_U8_MBTOUC # if !HAVE_INLINE extern int - u8_mbtouc_safe (ucs4_t *puc, const uint8_t *s, size_t n); + u8_mbtouc (ucs4_t *puc, const uint8_t *s, size_t n); # else -# include "utf8-ucs4-safe.h" +# include "utf8-ucs4.h" # endif #endif diff --git a/lib/unistr/u8-to-u16.c b/lib/unistr/u8-to-u16.c index ac4211b280..734c25b9d1 100644 --- a/lib/unistr/u8-to-u16.c +++ b/lib/unistr/u8-to-u16.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 = u8_mbtouc_safe (&uc, s, s_end - s); + count = u8_mbtouc (&uc, s, s_end - s); if (count < 0) { if (!(result == resultbuf || result == NULL)) diff --git a/lib/unistr/u8-to-u32.c b/lib/unistr/u8-to-u32.c index bd2a2f0260..29dc620de0 100644 --- a/lib/unistr/u8-to-u32.c +++ b/lib/unistr/u8-to-u32.c @@ -1,5 +1,5 @@ /* Convert UTF-8 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 = u8_mbtouc_safe (&uc, s, s_end - s); + count = u8_mbtouc (&uc, s, s_end - s); if (count < 0) { if (!(result == resultbuf || result == NULL)) diff --git a/modules/striconveh b/modules/striconveh index db375aa3c4..6b930873b1 100644 --- a/modules/striconveh +++ b/modules/striconveh @@ -8,7 +8,7 @@ lib/striconveh.c Depends-on: stdbool iconv -utf8-ucs4-safe +utf8-ucs4 ucs4-utf8 unistr/u8-prev unistr/u8-mbtouc-unsafe diff --git a/modules/unistr/u8-to-u16 b/modules/unistr/u8-to-u16 index b50d91975b..79dfb44bde 100644 --- a/modules/unistr/u8-to-u16 +++ b/modules/unistr/u8-to-u16 @@ -6,7 +6,7 @@ lib/unistr/u8-to-u16.c Depends-on: unistr/base -unistr/u8-mbtouc-safe +unistr/u8-mbtouc unistr/u16-uctomb configure.ac: diff --git a/modules/unistr/u8-to-u32 b/modules/unistr/u8-to-u32 index be2e05aabe..7b3dcb5b66 100644 --- a/modules/unistr/u8-to-u32 +++ b/modules/unistr/u8-to-u32 @@ -6,7 +6,7 @@ lib/unistr/u8-to-u32.c Depends-on: unistr/base -unistr/u8-mbtouc-safe +unistr/u8-mbtouc configure.ac: |