[src/trunk]: src/lib/libc/regex fix NLS compilation

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/47fe307b508d
branches:  trunk
changeset: 953079:47fe307b508d
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 25 21:47:46 2021 +0000

description:
fix NLS compilation

diffstat:

 lib/libc/regex/engine.c  |  7 +++----
 lib/libc/regex/regcomp.c |  6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r 47ac476f0328 -r 47fe307b508d lib/libc/regex/engine.c
--- a/lib/libc/regex/engine.c   Thu Feb 25 21:46:55 2021 +0000
+++ b/lib/libc/regex/engine.c   Thu Feb 25 21:47:46 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: engine.c,v 1.28 2021/02/25 21:28:40 christos Exp $ */
+/* $NetBSD: engine.c,v 1.29 2021/02/25 21:47:46 christos Exp $ */
 
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
@@ -41,7 +41,7 @@
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/lib/libc/regex/engine.c 368358 2020-12-05 03:16:05Z kevans $");
 #endif
-__RCSID("$NetBSD: engine.c,v 1.28 2021/02/25 21:28:40 christos Exp $");
+__RCSID("$NetBSD: engine.c,v 1.29 2021/02/25 21:47:46 christos Exp $");
 
 #include <stdbool.h>
 
@@ -187,9 +187,8 @@
 
        return (ret);
 out:
-#else
+#endif
        return (cur - nchar) > start ? cur - nchar : NULL;
-#endif
 }
 
 /*
diff -r 47ac476f0328 -r 47fe307b508d lib/libc/regex/regcomp.c
--- a/lib/libc/regex/regcomp.c  Thu Feb 25 21:46:55 2021 +0000
+++ b/lib/libc/regex/regcomp.c  Thu Feb 25 21:47:46 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: regcomp.c,v 1.42 2021/02/25 21:28:40 christos Exp $    */
+/*     $NetBSD: regcomp.c,v 1.43 2021/02/25 21:47:46 christos Exp $    */
 
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
@@ -47,7 +47,7 @@
 static char sccsid[] = "@(#)regcomp.c  8.5 (Berkeley) 3/20/94";
 __FBSDID("$FreeBSD: head/lib/libc/regex/regcomp.c 368359 2020-12-05 03:18:48Z kevans $");
 #endif
-__RCSID("$NetBSD: regcomp.c,v 1.42 2021/02/25 21:28:40 christos Exp $");
+__RCSID("$NetBSD: regcomp.c,v 1.43 2021/02/25 21:47:46 christos Exp $");
 
 #define _OPENBSD_SOURCE
 
@@ -2130,7 +2130,7 @@
                while (OP(s = *scan++) != OCHAR)
                        continue;
 #ifdef NLS
-               clen = wcrtomb(cp, (int)OPND(s), &mbs);
+               size_t clen = wcrtomb(cp, (int)OPND(s), &mbs);
                assert(clen != (size_t)-1);
                cp += clen;
 #else