projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lib/count-one-bits.h: Add comments. (From Bruno Haible.)
[gnulib.git]
/
lib
/
linebreak.c
diff --git
a/lib/linebreak.c
b/lib/linebreak.c
index
82aba3c
..
73dba73
100644
(file)
--- a/
lib/linebreak.c
+++ b/
lib/linebreak.c
@@
-1,5
+1,5
@@
/* linebreak.c - line breaking of Unicode strings
/* 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
Written by Bruno Haible <haible@clisp.cons.org>, 2001.
This program is free software; you can redistribute it and/or modify
@@
-25,14
+25,11
@@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#include <string.h>
#include "c-ctype.h"
#include "xsize.h"
#include <string.h>
#include "c-ctype.h"
#include "xsize.h"
-
-#include "utf8-ucs4.h"
-
-#include "utf16-ucs4.h"
+#include "unistr.h"
#ifdef unused
static inline int
#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;
{
*puc = *s;
return 1;
@@
-472,7
+469,7
@@
u8_width (const unsigned char *s, size_t n, const char *encoding)
unsigned int uc;
int w;
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 */
if (uc == 0)
break; /* end of string reached */
@@
-496,7
+493,7
@@
u16_width (const unsigned short *s, size_t n, const char *encoding)
unsigned int uc;
int w;
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 */
if (uc == 0)
break; /* end of string reached */
@@
-642,7
+639,7
@@
u8_possible_linebreaks (const unsigned char *s, size_t n, const char *encoding,
while (s < s_end)
{
unsigned int uc;
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)
int prop = lbrkprop_lookup (uc);
if (prop == LBP_BK)
@@
-754,7
+751,7
@@
u16_possible_linebreaks (const unsigned short *s, size_t n, const char *encoding
while (s < s_end)
{
unsigned int uc;
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)
int prop = lbrkprop_lookup (uc);
if (prop == LBP_BK)
@@
-983,7
+980,7
@@
u8_width_linebreaks (const unsigned char *s, size_t n,
while (s < s_end)
{
unsigned int uc;
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)
/* Respect the override. */
if (o != NULL && *o != UC_BREAK_UNDEFINED)
@@
-1067,7
+1064,7
@@
u16_width_linebreaks (const unsigned short *s, size_t n,
while (s < s_end)
{
unsigned int uc;
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)
/* Respect the override. */
if (o != NULL && *o != UC_BREAK_UNDEFINED)
@@
-1617,6
+1614,7
@@
mbs_width_linebreaks (const char *s, size_t n,
xsum4 (xtimes (n, sizeof (size_t)), m, m,
(o != NULL ? m : 0));
char *memory =
xsum4 (xtimes (n, sizeof (size_t)), m, m,
(o != NULL ? m : 0));
char *memory =
+ (char *)
(size_in_bounds_p (memory_size) ? malloc (memory_size) : NULL);
if (memory != NULL)
{
(size_in_bounds_p (memory_size) ? malloc (memory_size) : NULL);
if (memory != NULL)
{