diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2026-03-08 17:29:05 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2026-03-08 17:29:05 +0100 |
| commit | 33a5320dda21ae791eee4763c64f1285ae04217d (patch) | |
| tree | 5c15bc695be820b393a8496c5807ecafbbdeb89b /lib/uniwidth/u8-width.c | |
| parent | b2ac982cc8b5290699eb5f52fb043d3d15e2624b (diff) | |
| parent | ff33e1d252f46bec1a33e28700da3282fc24047a (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'lib/uniwidth/u8-width.c')
| -rw-r--r-- | lib/uniwidth/u8-width.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/uniwidth/u8-width.c b/lib/uniwidth/u8-width.c index a4df4c13..950ef419 100644 --- a/lib/uniwidth/u8-width.c +++ b/lib/uniwidth/u8-width.c @@ -1,5 +1,5 @@ /* Determine display width of UTF-8 string. - Copyright (C) 2001-2002, 2006-2007, 2009-2025 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2007, 2009-2026 Free Software Foundation, Inc. Written by Bruno Haible <bruno@clisp.org>, 2002. This file is free software. @@ -39,14 +39,12 @@ u8_width (const uint8_t *s, size_t n, const char *encoding) while (s < s_end) { ucs4_t uc; - int w; - s += u8_mbtouc_unsafe (&uc, s, s_end - s); if (uc == 0) break; /* end of string reached */ - w = uc_width (uc, encoding); + int w = uc_width (uc, encoding); if (w >= 0) /* ignore control characters in the string */ width += w; } |