diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/linebreak.c | 10 | ||||
| -rw-r--r-- | lib/striconveh.c | 4 | ||||
| -rw-r--r-- | lib/unistr.h | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/linebreak.c b/lib/linebreak.c index 09f110cf19..0ad46681ef 100644 --- 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 167ac92afc..1324da5a0d 100644 --- 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 e871cb1b99..a67e5939d5 100644 --- 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 |