From nobody Fri Oct 13 05:15:40 2023
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S6F8D5t0Zz4wT6Y;
Fri, 13 Oct 2023 05:15:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4S6F8D3r9pz3Qdq;
Fri, 13 Oct 2023 05:15:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1697174140;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=gXYiCf9Fh4KdhYxLaF2kPfu97nioDrJ3TULWO9dTW0U=;
b=ih+K2c3x37WZl0T+a+KzvxeFPE2PwMmMZsQBZaBsUpGfe0+/H+jbFHFDLEM0tNLFSinvEB
P7zMsfQ+uAGcwUnTHDdpQHD/j1sMdBWZ9RmJAJLlei6ajPUWd02dfz25zvI82hGRCeoNqN
480tHz5FTmooX4cFwZo5TTd2H9gKAJHCsM0eSV3LwqzTE9kDaqOBUY9A+oQWPt9YU05AJX
HjcSR6W2AVTyS6v2wcjE/r3hqF185eHEJxx1DiO0gTOxbJuFbVEQrRxWyOAXfK9z+Uh7dg
SAlGptwlZcj0pUew8j5Awe+m1OUorm//lrjezbFYvTIiYY+3s/x6d+owCyIWzw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697174140; a=rsa-sha256; cv=none;
b=xaocSO4qjAWYIr4bGb5O5TworYzA7vCTRb65GSc+g8pFDqw6sWE1D+IjAZF+atZv9TtrcP
2TCyIL4DocPdm85L68dhZG6mDHcnu7VvCKbWRoSOr2ivfaNF0THckNJLMIZIGik41I3+tP
HOGKCHriRGxfZ+/4+lQ+ANqlQXvT1RQcIuQ+HptgrElr4qgFdWFyhKS7RtY20Ut51lygwI
sVGlvcxtK4t3+Itr7eKctnvEA9ABYeYUzAo9C7xcELMXEWQIi8P5jWwEGu00yoRrOa4JQ7
VgJZSjeyCQl2ow2oj5fsOuNrmsrMObRVNBTmbeHBmEYDZchz0Xg7nCTy6W2lew==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1697174140;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=gXYiCf9Fh4KdhYxLaF2kPfu97nioDrJ3TULWO9dTW0U=;
b=QJe5z3zRKvolUCCAOGEYX89xnigY7gSbdXTdgjthheeYDHitNZWmJ2X/AGbbVlf6kLBiKZ
lreH6vK4jV4ak9u0o/jBA+ksJCVCFvZowqP1sIZNF19Ib1Gj5SSYmwWU7qmnnhNy0ObCXW
o6TE2zNKU0abh6v72xbhR8iQCwTH6pSFQkQqUDHggAgO10vgT9wGR86BFvvYcfbgXYWQhY
iLqF9UIsNGjv/5VR7bK6JUQcxXZtmxXt3pXMhTP4hdjItdOAHI8ZwP5+DIoNWanLst5QS0
5Nk3pgr57X2guoQ524o7JxQVIDeT9Crx5eLqfT43k3FJnxOkUqTXJ8DL8QZtgA==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S6F8D2hLpzb3g;
Fri, 13 Oct 2023 05:15:40 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39D5FeKr070216;
Fri, 13 Oct 2023 05:15:40 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39D5Feua070213;
Fri, 13 Oct 2023 05:15:40 GMT
(envelope-from git)
Date: Fri, 13 Oct 2023 05:15:40 GMT
Message-Id: <202310130515.39D5Feua070213@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Christos Margiolis <christos@FreeBSD.org>
Subject: git: 90367ba750bc - main - teken: fix style in teken_wcwidth.h
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-main@freebsd.org
X-BeenThere: dev-commits-src-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: christos
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 90367ba750bcbf3f9ac4609c3ec8df4ab95a22af
Auto-Submitted: auto-generated
The branch main has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=90367ba750bcbf3f9ac4609c3ec8df4ab95a22af
commit 90367ba750bcbf3f9ac4609c3ec8df4ab95a22af
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2023-10-13 05:14:57 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2023-10-13 05:14:57 +0000
teken: fix style in teken_wcwidth.h
Reviewed by: bojan.novkovic_fer.hr
MFC after: 2 weeks
Differential Revision: https://reviews.freebsd.org/D42164
---
sys/teken/teken_wcwidth.h | 265 +++++++++++++++++++++++-----------------------
1 file changed, 135 insertions(+), 130 deletions(-)
diff --git a/sys/teken/teken_wcwidth.h b/sys/teken/teken_wcwidth.h
index 14af2c6f9530..72df62704d73 100644
--- a/sys/teken/teken_wcwidth.h
+++ b/sys/teken/teken_wcwidth.h
@@ -11,112 +11,118 @@
#define TEKEN_UTF8_INVALID_CODEPOINT -1
struct interval {
- teken_char_t first;
- teken_char_t last;
+ teken_char_t first;
+ teken_char_t last;
};
-/* auxiliary function for binary search in interval table */
-static inline int bisearch(teken_char_t ucs, const struct interval *table, int max) {
- int min = 0;
- int mid;
+/* Auxiliary function for binary search in interval table */
+static inline int
+bisearch(teken_char_t ucs, const struct interval *table, int max)
+{
+ int min = 0;
+ int mid;
- if (ucs < table[0].first || ucs > table[max].last)
- return 0;
- while (max >= min) {
- mid = (min + max) / 2;
- if (ucs > table[mid].last)
- min = mid + 1;
- else if (ucs < table[mid].first)
- max = mid - 1;
- else
- return 1;
- }
+ if (ucs < table[0].first || ucs > table[max].last)
+ return (0);
+ while (max >= min) {
+ mid = (min + max) / 2;
+ if (ucs > table[mid].last)
+ min = mid + 1;
+ else if (ucs < table[mid].first)
+ max = mid - 1;
+ else
+ return (1);
+ }
- return 0;
+ return (0);
}
-static inline int teken_wcwidth(teken_char_t ucs)
+static inline int
+teken_wcwidth(teken_char_t ucs)
{
- /* sorted list of non-overlapping intervals of non-spacing characters */
- /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */
- static const struct interval combining[] = {
- { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },
- { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
- { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },
- { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },
- { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
- { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
- { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },
- { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },
- { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },
- { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },
- { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },
- { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },
- { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },
- { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },
- { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },
- { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },
- { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
- { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
- { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },
- { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
- { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },
- { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },
- { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },
- { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },
- { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },
- { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },
- { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },
- { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },
- { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },
- { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },
- { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },
- { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },
- { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },
- { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
- { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
- { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
- { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
- { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },
- { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },
- { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F },
- { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B },
- { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },
- { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
- { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },
- { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 },
- { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },
- { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },
- { 0xE0100, 0xE01EF }
- };
-
- /* test for 8-bit control characters */
- if (ucs == 0)
- return 0;
- if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
- return -1;
+ /*
+ * Sorted list of non-overlapping intervals of non-spacing characters.
+ * Generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c"
+ */
+ static const struct interval combining[] = {
+ { 0x0300, 0x036F }, { 0x0483, 0x0486 }, { 0x0488, 0x0489 },
+ { 0x0591, 0x05BD }, { 0x05BF, 0x05BF }, { 0x05C1, 0x05C2 },
+ { 0x05C4, 0x05C5 }, { 0x05C7, 0x05C7 }, { 0x0600, 0x0603 },
+ { 0x0610, 0x0615 }, { 0x064B, 0x065E }, { 0x0670, 0x0670 },
+ { 0x06D6, 0x06E4 }, { 0x06E7, 0x06E8 }, { 0x06EA, 0x06ED },
+ { 0x070F, 0x070F }, { 0x0711, 0x0711 }, { 0x0730, 0x074A },
+ { 0x07A6, 0x07B0 }, { 0x07EB, 0x07F3 }, { 0x0901, 0x0902 },
+ { 0x093C, 0x093C }, { 0x0941, 0x0948 }, { 0x094D, 0x094D },
+ { 0x0951, 0x0954 }, { 0x0962, 0x0963 }, { 0x0981, 0x0981 },
+ { 0x09BC, 0x09BC }, { 0x09C1, 0x09C4 }, { 0x09CD, 0x09CD },
+ { 0x09E2, 0x09E3 }, { 0x0A01, 0x0A02 }, { 0x0A3C, 0x0A3C },
+ { 0x0A41, 0x0A42 }, { 0x0A47, 0x0A48 }, { 0x0A4B, 0x0A4D },
+ { 0x0A70, 0x0A71 }, { 0x0A81, 0x0A82 }, { 0x0ABC, 0x0ABC },
+ { 0x0AC1, 0x0AC5 }, { 0x0AC7, 0x0AC8 }, { 0x0ACD, 0x0ACD },
+ { 0x0AE2, 0x0AE3 }, { 0x0B01, 0x0B01 }, { 0x0B3C, 0x0B3C },
+ { 0x0B3F, 0x0B3F }, { 0x0B41, 0x0B43 }, { 0x0B4D, 0x0B4D },
+ { 0x0B56, 0x0B56 }, { 0x0B82, 0x0B82 }, { 0x0BC0, 0x0BC0 },
+ { 0x0BCD, 0x0BCD }, { 0x0C3E, 0x0C40 }, { 0x0C46, 0x0C48 },
+ { 0x0C4A, 0x0C4D }, { 0x0C55, 0x0C56 }, { 0x0CBC, 0x0CBC },
+ { 0x0CBF, 0x0CBF }, { 0x0CC6, 0x0CC6 }, { 0x0CCC, 0x0CCD },
+ { 0x0CE2, 0x0CE3 }, { 0x0D41, 0x0D43 }, { 0x0D4D, 0x0D4D },
+ { 0x0DCA, 0x0DCA }, { 0x0DD2, 0x0DD4 }, { 0x0DD6, 0x0DD6 },
+ { 0x0E31, 0x0E31 }, { 0x0E34, 0x0E3A }, { 0x0E47, 0x0E4E },
+ { 0x0EB1, 0x0EB1 }, { 0x0EB4, 0x0EB9 }, { 0x0EBB, 0x0EBC },
+ { 0x0EC8, 0x0ECD }, { 0x0F18, 0x0F19 }, { 0x0F35, 0x0F35 },
+ { 0x0F37, 0x0F37 }, { 0x0F39, 0x0F39 }, { 0x0F71, 0x0F7E },
+ { 0x0F80, 0x0F84 }, { 0x0F86, 0x0F87 }, { 0x0F90, 0x0F97 },
+ { 0x0F99, 0x0FBC }, { 0x0FC6, 0x0FC6 }, { 0x102D, 0x1030 },
+ { 0x1032, 0x1032 }, { 0x1036, 0x1037 }, { 0x1039, 0x1039 },
+ { 0x1058, 0x1059 }, { 0x1160, 0x11FF }, { 0x135F, 0x135F },
+ { 0x1712, 0x1714 }, { 0x1732, 0x1734 }, { 0x1752, 0x1753 },
+ { 0x1772, 0x1773 }, { 0x17B4, 0x17B5 }, { 0x17B7, 0x17BD },
+ { 0x17C6, 0x17C6 }, { 0x17C9, 0x17D3 }, { 0x17DD, 0x17DD },
+ { 0x180B, 0x180D }, { 0x18A9, 0x18A9 }, { 0x1920, 0x1922 },
+ { 0x1927, 0x1928 }, { 0x1932, 0x1932 }, { 0x1939, 0x193B },
+ { 0x1A17, 0x1A18 }, { 0x1B00, 0x1B03 }, { 0x1B34, 0x1B34 },
+ { 0x1B36, 0x1B3A }, { 0x1B3C, 0x1B3C }, { 0x1B42, 0x1B42 },
+ { 0x1B6B, 0x1B73 }, { 0x1DC0, 0x1DCA }, { 0x1DFE, 0x1DFF },
+ { 0x200B, 0x200F }, { 0x202A, 0x202E }, { 0x2060, 0x2063 },
+ { 0x206A, 0x206F }, { 0x20D0, 0x20EF }, { 0x302A, 0x302F },
+ { 0x3099, 0x309A }, { 0xA806, 0xA806 }, { 0xA80B, 0xA80B },
+ { 0xA825, 0xA826 }, { 0xFB1E, 0xFB1E }, { 0xFE00, 0xFE0F },
+ { 0xFE20, 0xFE23 }, { 0xFEFF, 0xFEFF }, { 0xFFF9, 0xFFFB },
+ { 0x10A01, 0x10A03 }, { 0x10A05, 0x10A06 }, { 0x10A0C, 0x10A0F },
+ { 0x10A38, 0x10A3A }, { 0x10A3F, 0x10A3F }, { 0x1D167, 0x1D169 },
+ { 0x1D173, 0x1D182 }, { 0x1D185, 0x1D18B }, { 0x1D1AA, 0x1D1AD },
+ { 0x1D242, 0x1D244 }, { 0xE0001, 0xE0001 }, { 0xE0020, 0xE007F },
+ { 0xE0100, 0xE01EF }
+ };
- /* binary search in table of non-spacing characters */
- if (bisearch(ucs, combining,
- sizeof(combining) / sizeof(struct interval) - 1))
- return 0;
+ /* Test for 8-bit control characters */
+ if (ucs == 0)
+ return (0);
+ if (ucs < 32 || (ucs >= 0x7f && ucs < 0xa0))
+ return (-1);
- /* if we arrive here, ucs is not a combining or C0/C1 control character */
+ /* Binary search in table of non-spacing characters */
+ if (bisearch(ucs, combining, sizeof(combining) /
+ sizeof(struct interval) - 1))
+ return (0);
- return 1 +
- (ucs >= 0x1100 &&
- (ucs <= 0x115f || /* Hangul Jamo init. consonants */
- ucs == 0x2329 || ucs == 0x232a ||
- (ucs >= 0x2e80 && ucs <= 0xa4cf &&
- ucs != 0x303f) || /* CJK ... Yi */
- (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
- (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
- (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
- (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
- (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
- (ucs >= 0xffe0 && ucs <= 0xffe6) ||
- (ucs >= 0x20000 && ucs <= 0x2fffd) ||
- (ucs >= 0x30000 && ucs <= 0x3fffd)));
+ /*
+ * If we arrive here, ucs is not a combining or C0/C1 control character
+ */
+ return (1 +
+ (ucs >= 0x1100 &&
+ (ucs <= 0x115f || /* Hangul Jamo init. consonants */
+ ucs == 0x2329 || ucs == 0x232a ||
+ (ucs >= 0x2e80 && ucs <= 0xa4cf &&
+ ucs != 0x303f) || /* CJK ... Yi */
+ (ucs >= 0xac00 && ucs <= 0xd7a3) || /* Hangul Syllables */
+ (ucs >= 0xf900 && ucs <= 0xfaff) || /* CJK Compatibility Ideographs */
+ (ucs >= 0xfe10 && ucs <= 0xfe19) || /* Vertical forms */
+ (ucs >= 0xfe30 && ucs <= 0xfe6f) || /* CJK Compatibility Forms */
+ (ucs >= 0xff00 && ucs <= 0xff60) || /* Fullwidth Forms */
+ (ucs >= 0xffe0 && ucs <= 0xffe6) ||
+ (ucs >= 0x20000 && ucs <= 0x2fffd) ||
+ (ucs >= 0x30000 && ucs <= 0x3fffd))));
}
/*
@@ -127,39 +133,38 @@ static inline int teken_wcwidth(teken_char_t ucs)
static inline teken_char_t
teken_utf8_bytes_to_codepoint(uint8_t bytes[4], int nbytes)
{
+ /*
+ * Check for malformed characters by comparing 'nbytes' to the byte
+ * length of the character.
+ *
+ * The table in section 3 of RFC 3629 defines 4 different values
+ * indicating the length of a UTF-8 byte sequence.
+ *
+ * 0xxxxxxx -> 1 byte
+ * 110xxxxx -> 2 bytes
+ * 1110xxxx -> 3 bytes
+ * 11110xxx -> 4 bytes
+ *
+ * The length is determined by the higher-order bits in the leading
+ * octet (except in the first case, where an MSB of 0 means a byte
+ * length of 1). Here we flip the 4 upper bits and count the leading
+ * zeros using __builtin_clz() to determine the number of bytes.
+ */
+ if (__builtin_clz(~(bytes[0] & 0xf0) << 24) != nbytes)
+ return (TEKEN_UTF8_INVALID_CODEPOINT);
- /*
- * Check for malformed characters by comparing 'nbytes'
- * to the byte length of the character.
- *
- * The table in section 3 of RFC 3629 defines 4 different
- * values indicating the length of a UTF-8 byte sequence.
- *
- * 0xxxxxxx -> 1 byte
- * 110xxxxx -> 2 bytes
- * 1110xxxx -> 3 bytes
- * 11110xxx -> 4 bytes
- *
- * The length is determined by the higher-order bits in
- * the leading octet (except in the first case, where an MSB
- * of 0 means a byte length of 1). Here we flip the 4 upper
- * bits and count the leading zeros using __builtin_clz()
- * to determine the number of bytes.
- */
- if (__builtin_clz(~(bytes[0] & 0xf0) << 24) != nbytes)
- return (TEKEN_UTF8_INVALID_CODEPOINT);
-
- switch (nbytes) {
- case 1:
- return (bytes[0] & 0x7f);
- case 2:
- return (bytes[0] & 0x1f) << 6 | (bytes[1] & 0x3f);
- case 3:
- return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 | (bytes[2] & 0x3f);
- case 4:
- return (bytes[0] & 0x7) << 18 | (bytes[1] & 0x3f) << 12 |
- (bytes[2] & 0x3f) << 6 | (bytes[3] & 0x3f);
- default:
- return (TEKEN_UTF8_INVALID_CODEPOINT);
- }
+ switch (nbytes) {
+ case 1:
+ return (bytes[0] & 0x7f);
+ case 2:
+ return (bytes[0] & 0x1f) << 6 | (bytes[1] & 0x3f);
+ case 3:
+ return (bytes[0] & 0xf) << 12 | (bytes[1] & 0x3f) << 6 |
+ (bytes[2] & 0x3f);
+ case 4:
+ return (bytes[0] & 0x7) << 18 | (bytes[1] & 0x3f) << 12 |
+ (bytes[2] & 0x3f) << 6 | (bytes[3] & 0x3f);
+ default:
+ return (TEKEN_UTF8_INVALID_CODEPOINT);
+ }
}