projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log1pf-ieee: Work around test failure on OpenBSD 4.9 and AIX 7.1.
[gnulib.git]
/
lib
/
uniwidth
/
u8-width.c
diff --git
a/lib/uniwidth/u8-width.c
b/lib/uniwidth/u8-width.c
index
ad0d49d
..
d3d6a0a
100644
(file)
--- a/
lib/uniwidth/u8-width.c
+++ b/
lib/uniwidth/u8-width.c
@@
-1,5
+1,5
@@
/* Determine display width of UTF-8 string.
/* Determine display width of UTF-8 string.
- Copyright (C) 2001-2002, 2006-2007 Free Software Foundation, Inc.
+ Copyright (C) 2001-2002, 2006-2007
, 2009-2012
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
Written by Bruno Haible <bruno@clisp.org>, 2002.
This program is free software: you can redistribute it and/or modify it
@@
-36,11
+36,11
@@
u8_width (const uint8_t *s, size_t n, const char *encoding)
s += u8_mbtouc_unsafe (&uc, s, s_end - s);
if (uc == 0)
s += u8_mbtouc_unsafe (&uc, s, s_end - s);
if (uc == 0)
- break; /* end of string reached */
+
break; /* end of string reached */
w = uc_width (uc, encoding);
if (w >= 0) /* ignore control characters in the string */
w = uc_width (uc, encoding);
if (w >= 0) /* ignore control characters in the string */
- width += w;
+
width += w;
}
return width;
}
return width;