Module Name: src
Committed By: riastradh
Date: Thu Jun 29 16:11:31 UTC 2023
Modified Files:
src/lib/libc/gen: vis.c
Log Message:
vis(3): Avoid nonportable MIN in portable code.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/lib/libc/gen/vis.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/gen/vis.c
diff -u src/lib/libc/gen/vis.c:1.75 src/lib/libc/gen/vis.c:1.76
--- src/lib/libc/gen/vis.c:1.75 Fri Jun 18 10:57:14 2021
+++ src/lib/libc/gen/vis.c Thu Jun 29 16:11:31 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vis.c,v 1.75 2021/06/18 10:57:14 christos Exp $ */
+/* $NetBSD: vis.c,v 1.76 2023/06/29 16:11:31 riastradh Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: vis.c,v 1.75 2021/06/18 10:57:14 christos Exp $");
+__RCSID("$NetBSD: vis.c,v 1.76 2023/06/29 16:11:31 riastradh Exp $");
#endif /* LIBC_SCCS and not lint */
#ifdef __FBSDID
__FBSDID("$FreeBSD$");
@@ -466,7 +466,10 @@ istrsenvisx(char **mbdstp, size_t *dlen,
while (mbslength > 0) {
/* Convert one multibyte character to wchar_t. */
if (!cerr)
- clen = mbrtowc(src, mbsrc, MIN(mbslength, MB_LEN_MAX),
+ clen = mbrtowc(src, mbsrc,
+ (mbslength < MB_LEN_MAX
+ ? mbslength
+ : MB_LEN_MAX),
&mbstate);
if (cerr || clen < 0) {
/* Conversion error, process as a byte instead. */
