#include <string.h>
#include "c-ctype.h"
#include "xsize.h"
-
-#include "utf8-ucs4-unsafe.h"
-
-#include "utf16-ucs4.h"
+#include "unistr.h"
#ifdef unused
static inline int
-u32_mbtouc (unsigned int *puc, const unsigned int *s, size_t n)
+u32_mbtouc_unsafe (unsigned int *puc, const unsigned int *s, size_t n)
{
*puc = *s;
return 1;
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 */
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)
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)