Module Name: src
Committed By: riastradh
Date: Fri Aug 23 12:59:49 UTC 2024
Modified Files:
src/lib/libc/locale: mbrtoc16.3 mbrtoc32.3 mbrtoc8.3
Log Message:
mbrtoc8(3), mbrtoc16(3), mbrtoc32(3): Say 0 for zero code unit.
Rather than deal with differences between C11 and C23 in notation,
'\0' vs L'\0' vs u8'\0' vs u'\0' vs U'\0'.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/locale/mbrtoc16.3
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/locale/mbrtoc32.3
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/locale/mbrtoc8.3
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/mbrtoc16.3
diff -u src/lib/libc/locale/mbrtoc16.3:1.9 src/lib/libc/locale/mbrtoc16.3:1.10
--- src/lib/libc/locale/mbrtoc16.3:1.9 Sat Aug 17 12:37:05 2024
+++ src/lib/libc/locale/mbrtoc16.3 Fri Aug 23 12:59:49 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: mbrtoc16.3,v 1.9 2024/08/17 12:37:05 riastradh Exp $
+.\" $NetBSD: mbrtoc16.3,v 1.10 2024/08/23 12:59:49 riastradh Exp $
.\"
.\" Copyright (c) 2024 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -245,8 +245,8 @@ while (n) {
len = mbrtoc16(&c16, s, n, &mbs);
switch (len) {
- case 0: /* null terminator */
- assert(c16 == L'\e0');
+ case 0: /* NUL terminator */
+ assert(c16 == 0);
goto out;
default: /* scalar value or high surrogate */
printf("U+%04"PRIx16"\en", (uint16_t)c16);
Index: src/lib/libc/locale/mbrtoc32.3
diff -u src/lib/libc/locale/mbrtoc32.3:1.8 src/lib/libc/locale/mbrtoc32.3:1.9
--- src/lib/libc/locale/mbrtoc32.3:1.8 Sat Aug 17 01:52:51 2024
+++ src/lib/libc/locale/mbrtoc32.3 Fri Aug 23 12:59:49 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: mbrtoc32.3,v 1.8 2024/08/17 01:52:51 riastradh Exp $
+.\" $NetBSD: mbrtoc32.3,v 1.9 2024/08/23 12:59:49 riastradh Exp $
.\"
.\" Copyright (c) 2024 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -216,8 +216,8 @@ while (n) {
len = mbrtoc32(&c32, s, n, &mbs);
switch (len) {
- case 0: /* null terminator */
- assert(c32 == L'\e0');
+ case 0: /* NUL terminator */
+ assert(c32 == 0);
goto out;
default: /* scalar value */
printf("U+%04"PRIx32"\en", (uint32_t)c32);
Index: src/lib/libc/locale/mbrtoc8.3
diff -u src/lib/libc/locale/mbrtoc8.3:1.6 src/lib/libc/locale/mbrtoc8.3:1.7
--- src/lib/libc/locale/mbrtoc8.3:1.6 Sat Aug 17 12:37:29 2024
+++ src/lib/libc/locale/mbrtoc8.3 Fri Aug 23 12:59:49 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: mbrtoc8.3,v 1.6 2024/08/17 12:37:29 riastradh Exp $
+.\" $NetBSD: mbrtoc8.3,v 1.7 2024/08/23 12:59:49 riastradh Exp $
.\"
.\" Copyright (c) 2024 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -244,8 +244,8 @@ while (n) {
len = mbrtoc8(&c8, s, n, &mbs);
switch (len) {
- case 0: /* null terminator */
- assert(c8 == '\e0');
+ case 0: /* NUL terminator */
+ assert(c8 == 0);
goto out;
default: /* consumed input and yielded a byte c8 */
printf("0x%02hhx\en", c8);
