Module Name: src
Committed By: rillig
Date: Sun Aug 18 19:35:19 UTC 2024
Modified Files:
src/lib/libc/locale: mbrtoc8.c
Log Message:
mbrtoc8: remove lint-specific workarounds
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/locale/mbrtoc8.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/locale/mbrtoc8.c
diff -u src/lib/libc/locale/mbrtoc8.c:1.5 src/lib/libc/locale/mbrtoc8.c:1.6
--- src/lib/libc/locale/mbrtoc8.c:1.5 Sun Aug 18 13:35:11 2024
+++ src/lib/libc/locale/mbrtoc8.c Sun Aug 18 19:35:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mbrtoc8.c,v 1.5 2024/08/18 13:35:11 riastradh Exp $ */
+/* $NetBSD: mbrtoc8.c,v 1.6 2024/08/18 19:35:19 rillig Exp $ */
/*-
* Copyright (c) 2024 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mbrtoc8.c,v 1.5 2024/08/18 13:35:11 riastradh Exp $");
+__RCSID("$NetBSD: mbrtoc8.c,v 1.6 2024/08/18 19:35:19 rillig Exp $");
#include "namespace.h"
@@ -195,32 +195,23 @@ mbrtoc8_l(char8_t *restrict pc8, const c
break;
case 0x0080 ... 0x07ff:
if (pc8)
- *pc8 = (char8_t)(
- 0xc0 | __SHIFTOUT(c32, __BITS(10,6)));
- S->buf[2] = (char8_t)(
- 0x80 | __SHIFTOUT(c32, __BITS(5,0)));
+ *pc8 = 0xc0 | __SHIFTOUT(c32, __BITS(10,6));
+ S->buf[2] = 0x80 | __SHIFTOUT(c32, __BITS(5,0));
S->nleft = 1;
break;
case 0x0800 ... 0xffff:
if (pc8)
- *pc8 = (char8_t)(
- 0xe0 | __SHIFTOUT(c32, __BITS(15,12)));
- S->buf[1] = (char8_t)(
- 0x80 | __SHIFTOUT(c32, __BITS(11,6)));
- S->buf[2] = (char8_t)(
- 0x80 | __SHIFTOUT(c32, __BITS(5,0)));
+ *pc8 = 0xe0 | __SHIFTOUT(c32, __BITS(15,12));
+ S->buf[1] = 0x80 | __SHIFTOUT(c32, __BITS(11,6));
+ S->buf[2] = 0x80 | __SHIFTOUT(c32, __BITS(5,0));
S->nleft = 2;
break;
case 0x10000 ... 0x10ffff:
if (pc8)
- *pc8 = (char8_t)(
- 0xf0 | __SHIFTOUT(c32, __BITS(20,18)));
- S->buf[0] = (char8_t)(
- 0x80 | __SHIFTOUT(c32, __BITS(17,12)));
- S->buf[1] = (char8_t)(
- 0x80 | __SHIFTOUT(c32, __BITS(11,6)));
- S->buf[2] = (char8_t)(
- 0x80 | __SHIFTOUT(c32, __BITS(5,0)));
+ *pc8 = 0xf0 | __SHIFTOUT(c32, __BITS(20,18));
+ S->buf[0] = 0x80 | __SHIFTOUT(c32, __BITS(17,12));
+ S->buf[1] = 0x80 | __SHIFTOUT(c32, __BITS(11,6));
+ S->buf[2] = 0x80 | __SHIFTOUT(c32, __BITS(5,0));
S->nleft = 3;
break;
default:
