CVS commit: src
Module Name:src
Committed By: andvar
Date: Mon Jan 24 09:14:38 UTC 2022
Modified Files:
src/bin/mt: mt.c
src/lib/libc/resolv: res_comp.c
src/lib/libc/rpc: clnt_dg.c clnt_vc.c
src/lib/libresolv: dst_api.c
src/sbin/scsictl: scsi_sense.c
src/sys/arch/arm/imx: if_enet.c
src/sys/arch/hpcmips/dev: plumiobus.c
src/sys/dev/raidframe: rf_dagdegrd.c
src/usr.bin/login: login_pam.c
src/usr.bin/tip: tip.h
src/usr.bin/vgrind: extern.h vfontedpr.c
src/usr.sbin/installboot/arch: vax.c
src/usr.sbin/mmcformat: uscsi_sense.c
src/usr.sbin/sysinst: mbr.c
Log Message:
s/begining/beginning/ in comments and messages.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/bin/mt/mt.c
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/resolv/res_comp.c
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/rpc/clnt_dg.c
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/rpc/clnt_vc.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libresolv/dst_api.c
cvs rdiff -u -r1.9 -r1.10 src/sbin/scsictl/scsi_sense.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/imx/if_enet.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcmips/dev/plumiobus.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/raidframe/rf_dagdegrd.c
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/login/login_pam.c
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/tip/tip.h
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/vgrind/extern.h
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/vgrind/vfontedpr.c
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/installboot/arch/vax.c
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/mmcformat/uscsi_sense.c
cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/sysinst/mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/mt/mt.c
diff -u src/bin/mt/mt.c:1.48 src/bin/mt/mt.c:1.49
--- src/bin/mt/mt.c:1.48 Sat Sep 1 06:56:23 2018
+++ src/bin/mt/mt.c Mon Jan 24 09:14:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mt.c,v 1.48 2018/09/01 06:56:23 mlelstv Exp $ */
+/* $NetBSD: mt.c,v 1.49 2022/01/24 09:14:36 andvar Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)mt.c 8.2 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: mt.c,v 1.48 2018/09/01 06:56:23 mlelstv Exp $");
+__RCSID("$NetBSD: mt.c,v 1.49 2022/01/24 09:14:36 andvar Exp $");
#endif
#endif /* not lint */
@@ -175,7 +175,7 @@ main(int argc, char *argv[])
/* If mtget.mt_fileno was implemented, We could
compute the minimal seek needed to position
the tape. Until then, rewind and seek from
- begining-of-tape */
+ beginning-of-tape */
mt_com.mt_op = MTREW;
mt_com.mt_count = 1;
Index: src/lib/libc/resolv/res_comp.c
diff -u src/lib/libc/resolv/res_comp.c:1.13 src/lib/libc/resolv/res_comp.c:1.14
--- src/lib/libc/resolv/res_comp.c:1.13 Tue Feb 24 17:56:20 2015
+++ src/lib/libc/resolv/res_comp.c Mon Jan 24 09:14:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: res_comp.c,v 1.13 2015/02/24 17:56:20 christos Exp $ */
+/* $NetBSD: res_comp.c,v 1.14 2022/01/24 09:14:36 andvar Exp $ */
/*
* Copyright (c) 1985, 1993
@@ -71,7 +71,7 @@
static const char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp";
#else
-__RCSID("$NetBSD: res_comp.c,v 1.13 2015/02/24 17:56:20 christos Exp $");
+__RCSID("$NetBSD: res_comp.c,v 1.14 2022/01/24 09:14:36 andvar Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -105,7 +105,7 @@ __weak_alias(res_dnok,__res_dnok)
/*%
* Expand compressed domain name 'src' to full domain name.
*
- * \li 'msg' is a pointer to the begining of the message,
+ * \li 'msg' is a pointer to the beginning of the message,
* \li 'eom' points to the first location after the message,
* \li 'dst' is a pointer to a buffer of size 'dstsiz' for the result.
* \li Return size of compressed name or -1 if there was an error.
Index: src/lib/libc/rpc/clnt_dg.c
diff -u src/lib/libc/rpc/clnt_dg.c:1.31 src/lib/libc/rpc/clnt_dg.c:1.32
--- src/lib/libc/rpc/clnt_dg.c:1.31 Sun Dec 5 08:03:06 2021
+++ src/lib/libc/rpc/clnt_dg.c Mon Jan 24 09:14:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt_dg.c,v 1.31 2021/12/05 08:03:06 msaitoh Exp $ */
+/* $NetBSD: clnt_dg.c,v 1.32 2022/01/24 09:14:36 andvar Exp $ */
/*
* Copyright (c) 2010, Oracle America, Inc.
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
#else
-__RCSID("$NetBSD: clnt_dg.c,v 1.31 2021/12/05 08:03:06 msaitoh Exp $");
+__RCSID("$NetBSD: clnt_dg.c,v 1.32 2022/01/24 09:14:36 andvar Exp $");
#endif
#endif
@@ -652,7 +652,7 @@ clnt_dg_control(CLIENT *cl, u_int reques
/*
* This RELIES on the information that, in the call body,
* the version number field is the fifth field from the
- * begining of the RPC header. MUST be changed if the
+ * beginning of the RPC header. MUST be changed if the
CVS commit: src
Module Name:src Committed By: andvar Date: Mon Jan 24 09:14:38 UTC 2022 Modified Files: src/bin/mt: mt.c src/lib/libc/resolv: res_comp.c src/lib/libc/rpc: clnt_dg.c clnt_vc.c src/lib/libresolv: dst_api.c src/sbin/scsictl: scsi_sense.c src/sys/arch/arm/imx: if_enet.c src/sys/arch/hpcmips/dev: plumiobus.c src/sys/dev/raidframe: rf_dagdegrd.c src/usr.bin/login: login_pam.c src/usr.bin/tip: tip.h src/usr.bin/vgrind: extern.h vfontedpr.c src/usr.sbin/installboot/arch: vax.c src/usr.sbin/mmcformat: uscsi_sense.c src/usr.sbin/sysinst: mbr.c Log Message: s/begining/beginning/ in comments and messages. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/bin/mt/mt.c cvs rdiff -u -r1.13 -r1.14 src/lib/libc/resolv/res_comp.c cvs rdiff -u -r1.31 -r1.32 src/lib/libc/rpc/clnt_dg.c cvs rdiff -u -r1.27 -r1.28 src/lib/libc/rpc/clnt_vc.c cvs rdiff -u -r1.7 -r1.8 src/lib/libresolv/dst_api.c cvs rdiff -u -r1.9 -r1.10 src/sbin/scsictl/scsi_sense.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/imx/if_enet.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hpcmips/dev/plumiobus.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/raidframe/rf_dagdegrd.c cvs rdiff -u -r1.27 -r1.28 src/usr.bin/login/login_pam.c cvs rdiff -u -r1.35 -r1.36 src/usr.bin/tip/tip.h cvs rdiff -u -r1.7 -r1.8 src/usr.bin/vgrind/extern.h cvs rdiff -u -r1.18 -r1.19 src/usr.bin/vgrind/vfontedpr.c cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/installboot/arch/vax.c cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/mmcformat/uscsi_sense.c cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/sysinst/mbr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: andvar Date: Mon Jan 24 09:42:14 UTC 2022 Modified Files: src/distrib/common: buildfloppies.sh src/sys/dev/i2c: adm1021.c i2c.c src/sys/dev/ic: ispmbox.h src/sys/fs/udf: udf_subr.c src/sys/kern: subr_cpu.c Log Message: remove double "with" in comments and usage text. Also fix one typo. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/common/buildfloppies.sh cvs rdiff -u -r1.29 -r1.30 src/sys/dev/i2c/adm1021.c cvs rdiff -u -r1.83 -r1.84 src/sys/dev/i2c/i2c.c cvs rdiff -u -r1.56 -r1.57 src/sys/dev/ic/ispmbox.h cvs rdiff -u -r1.163 -r1.164 src/sys/fs/udf/udf_subr.c cvs rdiff -u -r1.17 -r1.18 src/sys/kern/subr_cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: andvar
Date: Mon Jan 24 09:42:14 UTC 2022
Modified Files:
src/distrib/common: buildfloppies.sh
src/sys/dev/i2c: adm1021.c i2c.c
src/sys/dev/ic: ispmbox.h
src/sys/fs/udf: udf_subr.c
src/sys/kern: subr_cpu.c
Log Message:
remove double "with" in comments and usage text. Also fix one typo.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/common/buildfloppies.sh
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/i2c/adm1021.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/ic/ispmbox.h
cvs rdiff -u -r1.163 -r1.164 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.17 -r1.18 src/sys/kern/subr_cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/buildfloppies.sh
diff -u src/distrib/common/buildfloppies.sh:1.19 src/distrib/common/buildfloppies.sh:1.20
--- src/distrib/common/buildfloppies.sh:1.19 Sun Sep 16 21:49:18 2018
+++ src/distrib/common/buildfloppies.sh Mon Jan 24 09:42:13 2022
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: buildfloppies.sh,v 1.19 2018/09/16 21:49:18 kre Exp $
+# $NetBSD: buildfloppies.sh,v 1.20 2022/01/24 09:42:13 andvar Exp $
#
# Copyright (c) 2002-2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -42,7 +42,7 @@ usage()
cat 1>&2 << _USAGE_
Usage: ${prog} [options] base size file [...]
-i instboot eval instboot as a shell command to install a
- bootstrap. @IMAGE@ is replaced with with the
+ bootstrap. @IMAGE@ is replaced with the
file name of the floppy image.
-m max maximum number of floppies to build
-N etcdir directory in which to find passwd and group files.
Index: src/sys/dev/i2c/adm1021.c
diff -u src/sys/dev/i2c/adm1021.c:1.29 src/sys/dev/i2c/adm1021.c:1.30
--- src/sys/dev/i2c/adm1021.c:1.29 Mon Jun 21 03:12:54 2021
+++ src/sys/dev/i2c/adm1021.c Mon Jan 24 09:42:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: adm1021.c,v 1.29 2021/06/21 03:12:54 christos Exp $ */
+/* $NetBSD: adm1021.c,v 1.30 2022/01/24 09:42:14 andvar Exp $ */
/* $OpenBSD: adm1021.c,v 1.27 2007/06/24 05:34:35 dlg Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.29 2021/06/21 03:12:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm1021.c,v 1.30 2022/01/24 09:42:14 andvar Exp $");
#include
#include
@@ -280,7 +280,7 @@ admtemp_setflags(struct admtemp_softc *s
/*
* MAX6642 doesn't have a revision register
* XXX this works only on macppc with iic at pmu because the
- * pmu doesn't return an error for nonexistant registers, it
+ * pmu doesn't return an error for nonexistent registers, it
* just repeats previous data
*/
if (*comp == *rev) {
Index: src/sys/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.83 src/sys/dev/i2c/i2c.c:1.84
--- src/sys/dev/i2c/i2c.c:1.83 Sat Jan 22 11:49:17 2022
+++ src/sys/dev/i2c/i2c.c Mon Jan 24 09:42:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c.c,v 1.83 2022/01/22 11:49:17 thorpej Exp $ */
+/* $NetBSD: i2c.c,v 1.84 2022/01/24 09:42:14 andvar Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -53,7 +53,7 @@
#endif /* _KERNEL_OPT */
#include
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.83 2022/01/22 11:49:17 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.84 2022/01/24 09:42:14 andvar Exp $");
#include
#include
@@ -763,7 +763,7 @@ iic_compatible_lookup(const struct i2c_a
/*
* iic_use_direct_match --
* Helper for direct-config of i2c. Returns true if this is
- * a direct-config situation, along with with match result.
+ * a direct-config situation, along with match result.
* Returns false if the driver should use indirect-config
* matching logic.
*/
Index: src/sys/dev/ic/ispmbox.h
diff -u src/sys/dev/ic/ispmbox.h:1.56 src/sys/dev/ic/ispmbox.h:1.57
--- src/sys/dev/ic/ispmbox.h:1.56 Sat Sep 14 12:43:08 2013
+++ src/sys/dev/ic/ispmbox.h Mon Jan 24 09:42:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ispmbox.h,v 1.56 2013/09/14 12:43:08 martin Exp $ */
+/* $NetBSD: ispmbox.h,v 1.57 2022/01/24 09:42:14 andvar Exp $ */
/*
* Copyright (C) 1997, 1998, 1999 National Aeronautics & Space Administration
* All rights reserved.
@@ -1400,7 +1400,7 @@ typedef struct {
#define PLOGX_FLG_IMPLICIT_LOGO_ALL 0x20 /* if with LOGO */
#define PLOGX_FLG_EXPLICIT_LOGO 0x40 /* if with LOGO */
#define PLOGX_FLG_COMMON_FEATURES 0x80 /* if with PLOGI */
-#define PLOGX_FLG_FREE_NPHDL 0x80 /* if with with LOGO */
+#define PLOGX_FLG_FREE_NPHDL 0x80 /* if with LOGO */
#define PLOGX_FLG_CLASS2 0x100 /* if with PLOGI */
#define PLOGX_FLG_FCP2_OVERRIDE 0x200 /* if with PRLOG, PRLI */
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.163 src/sys/fs/udf/udf_subr.c:1.164
--- src/sys/fs/udf/udf_subr.c:1.163 Sat Jan 1 08:34:35 2022
+++ src/sys/fs/udf/udf_subr.c Mon Jan 24 09:42:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.163 2022/01/01
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Mon Jan 24 20:49:55 UTC 2022 Modified Files: src/usr.bin/make: var.c Log Message: make: when expanding nested variables, check simple things first No functional change, just a little performance improvement for expressions that are not evaluated anyway but only parsed. To generate a diff of this commit: cvs rdiff -u -r1.1002 -r1.1003 src/usr.bin/make/var.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Mon Jan 24 20:49:55 UTC 2022
Modified Files:
src/usr.bin/make: var.c
Log Message:
make: when expanding nested variables, check simple things first
No functional change, just a little performance improvement for
expressions that are not evaluated anyway but only parsed.
To generate a diff of this commit:
cvs rdiff -u -r1.1002 -r1.1003 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1002 src/usr.bin/make/var.c:1.1003
--- src/usr.bin/make/var.c:1.1002 Sat Jan 15 19:05:23 2022
+++ src/usr.bin/make/var.c Mon Jan 24 20:49:55 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1002 2022/01/15 19:05:23 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1003 2022/01/24 20:49:55 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1002 2022/01/15 19:05:23 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1003 2022/01/24 20:49:55 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -4545,8 +4545,8 @@ Var_Parse(const char **pp, GNode *scope,
* Before applying any modifiers, expand any nested expressions from
* the variable value.
*/
- if (strchr(Expr_Str(&expr), '$') != NULL &&
- VarEvalMode_ShouldEval(emode)) {
+ if (VarEvalMode_ShouldEval(emode) &&
+ strchr(Expr_Str(&expr), '$') != NULL) {
char *expanded;
VarEvalMode nested_emode = emode;
if (opts.strict)
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Mon Jan 24 20:54:54 UTC 2022 Modified Files: src/usr.bin/make: var.c Log Message: make: remove unsatisfiable condition in VarSubstExpr At that point, emode can have only 2 values, none of which is VARE_UNDEFERR. No binary change since GCC had figured this out all the time, it just didn't reveal this little secret. To generate a diff of this commit: cvs rdiff -u -r1.1003 -r1.1004 src/usr.bin/make/var.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Mon Jan 24 20:54:54 UTC 2022
Modified Files:
src/usr.bin/make: var.c
Log Message:
make: remove unsatisfiable condition in VarSubstExpr
At that point, emode can have only 2 values, none of which is
VARE_UNDEFERR.
No binary change since GCC had figured this out all the time, it just
didn't reveal this little secret.
To generate a diff of this commit:
cvs rdiff -u -r1.1003 -r1.1004 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1003 src/usr.bin/make/var.c:1.1004
--- src/usr.bin/make/var.c:1.1003 Mon Jan 24 20:49:55 2022
+++ src/usr.bin/make/var.c Mon Jan 24 20:54:54 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1003 2022/01/24 20:49:55 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1004 2022/01/24 20:54:54 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1003 2022/01/24 20:49:55 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1004 2022/01/24 20:54:54 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -4626,7 +4626,7 @@ VarSubstExpr(const char **pp, Buffer *bu
if (val.str == var_Error || val.str == varUndefined) {
if (!VarEvalMode_ShouldKeepUndef(emode)) {
p = nested_p;
- } else if (emode == VARE_UNDEFERR || val.str == var_Error) {
+ } else if (val.str == var_Error) {
/*
* XXX: This condition is wrong. If val == var_Error,
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Mon Jan 24 22:59:50 UTC 2022 Modified Files: src/usr.bin/make: var.c src/usr.bin/make/unit-tests: varparse-errors.exp varparse-errors.mk Log Message: tests/make: demonstrate that the 'static' in Var_Parse has an effect To generate a diff of this commit: cvs rdiff -u -r1.1004 -r1.1005 src/usr.bin/make/var.c cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varparse-errors.exp \ src/usr.bin/make/unit-tests/varparse-errors.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Mon Jan 24 22:59:50 UTC 2022
Modified Files:
src/usr.bin/make: var.c
src/usr.bin/make/unit-tests: varparse-errors.exp varparse-errors.mk
Log Message:
tests/make: demonstrate that the 'static' in Var_Parse has an effect
To generate a diff of this commit:
cvs rdiff -u -r1.1004 -r1.1005 src/usr.bin/make/var.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varparse-errors.exp \
src/usr.bin/make/unit-tests/varparse-errors.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1004 src/usr.bin/make/var.c:1.1005
--- src/usr.bin/make/var.c:1.1004 Mon Jan 24 20:54:54 2022
+++ src/usr.bin/make/var.c Mon Jan 24 22:59:49 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1004 2022/01/24 20:54:54 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1005 2022/01/24 22:59:49 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1004 2022/01/24 20:54:54 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1005 2022/01/24 22:59:49 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -4704,7 +4704,7 @@ Var_Subst(const char *str, GNode *scope,
* Set true if an error has already been reported, to prevent a
* plethora of messages when recursing
*/
- /* XXX: Why is the 'static' necessary here? */
+ /* See varparse-errors.mk for why the 'static' is necessary here. */
static bool errorReported;
Buf_Init(&res);
Index: src/usr.bin/make/unit-tests/varparse-errors.exp
diff -u src/usr.bin/make/unit-tests/varparse-errors.exp:1.4 src/usr.bin/make/unit-tests/varparse-errors.exp:1.5
--- src/usr.bin/make/unit-tests/varparse-errors.exp:1.4 Tue Feb 23 15:19:41 2021
+++ src/usr.bin/make/unit-tests/varparse-errors.exp Mon Jan 24 22:59:49 2022
@@ -1,5 +1,11 @@
make: "varparse-errors.mk" line 38: Unknown modifier "Z"
make: "varparse-errors.mk" line 46: Unknown modifier "Z"
+make: Bad modifier ":OX" for variable ""
+make: "varparse-errors.mk" line 68: Undefined variable "${:U:OX"
+make: Bad modifier ":OX" for variable ""
+make: Bad modifier ":OX" for variable ""
+make: "varparse-errors.mk" line 68: Undefined variable "${:U:OX"
+make: Bad modifier ":OX" for variable ""
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/varparse-errors.mk
diff -u src/usr.bin/make/unit-tests/varparse-errors.mk:1.4 src/usr.bin/make/unit-tests/varparse-errors.mk:1.5
--- src/usr.bin/make/unit-tests/varparse-errors.mk:1.4 Mon Mar 15 12:15:03 2021
+++ src/usr.bin/make/unit-tests/varparse-errors.mk Mon Jan 24 22:59:49 2022
@@ -1,4 +1,4 @@
-# $NetBSD: varparse-errors.mk,v 1.4 2021/03/15 12:15:03 rillig Exp $
+# $NetBSD: varparse-errors.mk,v 1.5 2022/01/24 22:59:49 rillig Exp $
# Tests for parsing and evaluating all kinds of variable expressions.
#
@@ -48,4 +48,24 @@ VAR.${:U:Z}post= unknown modifier with t
. error
.endif
+# Demonstrate an edge case in which the 'static' for 'errorReported' in
+# Var_Subst actually makes a difference, preventing "a plethora of messages".
+# Given that this is an edge case and the error message is wrong and thus
+# misleading anyway, that piece of code is probably not necessary. The wrong
+# condition was added in var.c 1.185 from 2014-05-19.
+#
+# To trigger this difference, the variable assignment must use the assignment
+# operator ':=' to make VarEvalMode_ShouldKeepUndef return true. There must
+# be 2 expressions that create a parse error, which in this case is ':OX'.
+# These expressions must be nested in some way. The below expressions are
+# minimal, that is, removing any part of it destroys the effect.
+#
+# Without the 'static', there would be one more message like this:
+# Undefined variable "${:U:OX"
+#
+#.MAKEFLAGS: -dv
+IND= ${:OX}
+_:= ${:U:OX:U${IND}} ${:U:OX:U${IND}}
+#.MAKEFLAGS: -d0
+
all:
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Tue Jan 25 01:56:22 UTC 2022
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.c ixgbe_mbx.c ixgbe_netbsd.h
ixv.c
Log Message:
Use atomic_{load,store}_relaxed() for event counters.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.304 -r1.305 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/ixgbe/ixgbe_mbx.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h
cvs rdiff -u -r1.177 -r1.178 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Tue Jan 25 01:56:22 UTC 2022
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.c ixgbe_mbx.c ixgbe_netbsd.h
ixv.c
Log Message:
Use atomic_{load,store}_relaxed() for event counters.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.304 -r1.305 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/ixgbe/ixgbe_mbx.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h
cvs rdiff -u -r1.177 -r1.178 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.94 src/sys/dev/pci/ixgbe/ix_txrx.c:1.95
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.94 Wed Sep 8 09:09:47 2021
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Tue Jan 25 01:56:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.94 2021/09/08 09:09:47 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.95 2022/01/25 01:56:22 msaitoh Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.94 2021/09/08 09:09:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.95 2022/01/25 01:56:22 msaitoh Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -247,7 +247,7 @@ ixgbe_mq_start(struct ifnet *ifp, struct
if (__predict_false(!pcq_put(txr->txr_interq, m))) {
m_freem(m);
- txr->pcq_drops.ev_count++;
+ IXGBE_EVC_ADD(&txr->pcq_drops, 1);
return ENOBUFS;
}
if (IXGBE_TX_TRYLOCK(txr)) {
@@ -475,7 +475,7 @@ retry:
/* Make certain there are enough descriptors */
if (txr->tx_avail < (map->dm_nsegs + 2)) {
txr->txr_no_space = true;
- txr->no_desc_avail.ev_count++;
+ IXGBE_EVC_ADD(&txr->no_desc_avail, 1);
ixgbe_dmamap_unload(txr->txtag, txbuf->map);
return EAGAIN;
}
@@ -546,7 +546,7 @@ retry:
* Advance the Transmit Descriptor Tail (Tdt), this tells the
* hardware that this frame is available to transmit.
*/
- ++txr->total_packets.ev_count;
+ IXGBE_EVC_ADD(&txr->total_packets, 1);
IXGBE_WRITE_REG(&adapter->hw, txr->tail, i);
net_stat_ref_t nsr = IF_STAT_GETREF(ifp);
@@ -582,7 +582,7 @@ ixgbe_drain(struct ifnet *ifp, struct tx
while ((m = pcq_get(txr->txr_interq)) != NULL) {
m_freem(m);
- txr->pcq_drops.ev_count++;
+ IXGBE_EVC_ADD(&txr->pcq_drops, 1);
}
}
@@ -839,7 +839,7 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr,
int rv = ixgbe_tso_setup(txr, mp, cmd_type_len, olinfo_status);
if (rv != 0)
- ++adapter->tso_err.ev_count;
+ IXGBE_EVC_ADD(&adapter->tso_err, 1);
return rv;
}
@@ -1081,7 +1081,7 @@ ixgbe_tso_setup(struct tx_ring *txr, str
*cmd_type_len |= IXGBE_ADVTXD_DCMD_TSE;
*olinfo_status |= IXGBE_TXD_POPTS_TXSM << 8;
*olinfo_status |= paylen << IXGBE_ADVTXD_PAYLEN_SHIFT;
- ++txr->tso_tx.ev_count;
+ IXGBE_EVC_ADD(&txr->tso_tx, 1);
return (0);
} /* ixgbe_tso_setup */
@@ -1353,7 +1353,7 @@ ixgbe_refresh_mbufs(struct rx_ring *rxr,
if (__predict_false(rxbuf->buf == NULL)) {
mp = ixgbe_getcl();
if (mp == NULL) {
-rxr->no_mbuf.ev_count++;
+IXGBE_EVC_ADD(&rxr->no_mbuf, 1);
goto update;
}
mp->m_pkthdr.len = mp->m_len = rxr->mbuf_sz;
@@ -1536,7 +1536,7 @@ ixgbe_setup_receive_ring(struct rx_ring
rxbuf->flags = 0;
rxbuf->buf = ixgbe_getcl();
if (rxbuf->buf == NULL) {
- rxr->no_mbuf.ev_count++;
+ IXGBE_EVC_ADD(&rxr->no_mbuf, 1);
error = ENOBUFS;
goto fail;
}
@@ -1569,11 +1569,11 @@ ixgbe_setup_receive_ring(struct rx_ring
rxr->next_to_refresh = adapter->num_rx_desc - 1; /* Fully allocated */
rxr->lro_enabled = FALSE;
rxr->discard_multidesc = false;
- rxr->rx_copies.ev_count = 0;
+ IXGBE_EVC_STORE(&rxr->rx_copies, 0);
#if 0 /* NetBSD */
- rxr->rx_bytes.ev_count = 0;
+ IXGBE_EVC_STORE(&rxr->rx_bytes, 0);
#if 1 /* Fix inconsistency */
- rxr->rx_packets.ev_count = 0;
+ IXGBE_EVC_STORE(&rxr->rx_packets, 0);
#endif
#endif
rxr->vtag_strip = FALSE;
@@ -1904,7 +1904,7 @@ ixgbe_rxeof(struct ix_queue *que)
if (adapter->feat_en & IXGBE_FEATURE_VF)
if_inc_counter(ifp, IFCOUNTER_IERRORS, 1);
#endif
- rxr->rx_discarded.ev_count++;
+ IXGBE_EVC_ADD(&rxr->rx_discarded, 1);
ixgbe_rx_discard(rxr, i);
discard_multidesc = false;
goto next_desc;
@@ -1920,14 +1920,14 @@ ixgbe_rxeof(struct ix_queue *que)
/* For short packet. See below. */
sendmp = m_gethdr(M_NOWAIT, MT_DATA);
if (__predict_false(sendmp == NULL)) {
- rxr->no_mbuf.ev_count++;
+ IXGBE_EVC_ADD(&rxr->no_mbuf, 1);
discard = true;
}
} else {
/* For long packet. */
newmp = ixgbe_getcl();
if (__predict_false(newmp == NULL)) {
- rxr->no_mbuf.ev_count++;
+ IXGBE_EVC_ADD(&rxr->no_mbuf, 1);
discard = true;
}
}
@@ -2031,7 +2031,7 @@ ixgbe_rxeof(st
CVS commit: src/lib/libcurses
Module Name:src
Committed By: blymn
Date: Tue Jan 25 03:05:06 UTC 2022
Modified Files:
src/lib/libcurses: add_wchstr.c addbytes.c background.c border.c
clrtobot.c clrtoeol.c cr_put.c curses_private.h delch.c erase.c
in_wch.c in_wchstr.c ins_wch.c ins_wstr.c insch.c insdelln.c
insstr.c inwstr.c newwin.c refresh.c resize.c slk.c
Log Message:
Correct (hopefully) the handling of wide characters.
* Remove the WCOL family of macros, these were "stealing" the upper bits
of a character attribute to store the column width of a character. No
warning was given about this in curses.h which meant it was easy to
accidentally reuse the bits in use by the WCOL macros (we already did).
Add couple of 16bit ints to the character structure iff HAVE_WCHAR is
true to hold the display width and wide char related flags (just
continuation at the moment)
* Convert all instances of WCOL macros to just reference the column width
in the char structure so it is not obfuscated.
* Fix cursor positioning so placing a cursor in the middle of a wide char
actually does just that.
* Fix plod so it understands that if the cursor is going to be positioned
in the middle of a wide char it cannot just reprint the char to get there.
* Fix plodput so it correctly counts the number of output characters for
wide characters.
* Fix slk routines to properly size the wctomb() buffer.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/lib/libcurses/add_wchstr.c
cvs rdiff -u -r1.60 -r1.61 src/lib/libcurses/addbytes.c
cvs rdiff -u -r1.27 -r1.28 src/lib/libcurses/background.c \
src/lib/libcurses/clrtobot.c
cvs rdiff -u -r1.21 -r1.22 src/lib/libcurses/border.c \
src/lib/libcurses/ins_wstr.c
cvs rdiff -u -r1.32 -r1.33 src/lib/libcurses/clrtoeol.c
cvs rdiff -u -r1.37 -r1.38 src/lib/libcurses/cr_put.c
cvs rdiff -u -r1.76 -r1.77 src/lib/libcurses/curses_private.h
cvs rdiff -u -r1.26 -r1.27 src/lib/libcurses/delch.c \
src/lib/libcurses/insch.c
cvs rdiff -u -r1.33 -r1.34 src/lib/libcurses/erase.c \
src/lib/libcurses/resize.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libcurses/in_wch.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libcurses/in_wchstr.c \
src/lib/libcurses/insstr.c src/lib/libcurses/inwstr.c
cvs rdiff -u -r1.17 -r1.18 src/lib/libcurses/ins_wch.c
cvs rdiff -u -r1.19 -r1.20 src/lib/libcurses/insdelln.c
cvs rdiff -u -r1.63 -r1.64 src/lib/libcurses/newwin.c
cvs rdiff -u -r1.117 -r1.118 src/lib/libcurses/refresh.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libcurses/slk.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/libcurses/add_wchstr.c
diff -u src/lib/libcurses/add_wchstr.c:1.10 src/lib/libcurses/add_wchstr.c:1.11
--- src/lib/libcurses/add_wchstr.c:1.10 Mon Sep 6 07:45:48 2021
+++ src/lib/libcurses/add_wchstr.c Tue Jan 25 03:05:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: add_wchstr.c,v 1.10 2021/09/06 07:45:48 rin Exp $ */
+/* $NetBSD: add_wchstr.c,v 1.11 2022/01/25 03:05:06 blymn Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: add_wchstr.c,v 1.10 2021/09/06 07:45:48 rin Exp $");
+__RCSID("$NetBSD: add_wchstr.c,v 1.11 2022/01/25 03:05:06 blymn Exp $");
#endif/* not lint */
#include
@@ -163,7 +163,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t
lp = &win->alines[y]->line[x];
lnp = win->alines[y];
- cw = WCOL(*lp);
+ cw = (*lp).wcols;
if (cw >= 0) {
sx = x;
} else {
@@ -174,7 +174,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t
if (_cursesi_copy_nsp(win->bnsp, tp) == ERR)
return ERR;
tp->attr = win->battr;
-SET_WCOL(*tp, 1);
+(*tp).wcols = 1;
np = tp->nsp;
}
} else {
@@ -211,7 +211,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t
== ERR)
return ERR;
lp->attr = win->battr;
- SET_WCOL(*lp, 1);
+ (*lp).wcols = 1;
lp++, ex++;
}
ex = win->maxx - 1;
@@ -230,7 +230,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t
}
lp->ch = chp->vals[0];
lp->attr = chp->attributes & WA_ATTRIBUTES;
- SET_WCOL(*lp, cw);
+ (*lp).wcols = cw;
if (chp->elements > 1) {
for (i = 1; i < chp->elements; i++) {
np = (nschar_t *)
@@ -258,7 +258,7 @@ wadd_wchnstr(WINDOW *win, const cchar_t
}
lp->ch = chp->vals[0];
lp->attr = chp->attributes & WA_ATTRIBUTES;
-SET_WCOL(*lp, x - ex);
+(*lp).wcols = x - ex;
lp++, ex++;
}
} else {
Index: src/lib/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.60 src/lib/libcurses/addbytes.c:1.61
--- src/lib/libcurses/addbytes.c:1.60 Sun Jan 16 10:30:45 2022
+++ src/lib/libcurses/addbytes.c Tue Jan 25 03:05:06 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: addbytes.c,v 1.60 2022/01/16 10:30:45 rillig Exp $ */
+/* $NetBSD: addbytes.c,v 1.61 2022/01/25 03:05:06 blymn Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
CVS commit: src/lib/libcurses
Module Name:src Committed By: blymn Date: Tue Jan 25 03:05:06 UTC 2022 Modified Files: src/lib/libcurses: add_wchstr.c addbytes.c background.c border.c clrtobot.c clrtoeol.c cr_put.c curses_private.h delch.c erase.c in_wch.c in_wchstr.c ins_wch.c ins_wstr.c insch.c insdelln.c insstr.c inwstr.c newwin.c refresh.c resize.c slk.c Log Message: Correct (hopefully) the handling of wide characters. * Remove the WCOL family of macros, these were "stealing" the upper bits of a character attribute to store the column width of a character. No warning was given about this in curses.h which meant it was easy to accidentally reuse the bits in use by the WCOL macros (we already did). Add couple of 16bit ints to the character structure iff HAVE_WCHAR is true to hold the display width and wide char related flags (just continuation at the moment) * Convert all instances of WCOL macros to just reference the column width in the char structure so it is not obfuscated. * Fix cursor positioning so placing a cursor in the middle of a wide char actually does just that. * Fix plod so it understands that if the cursor is going to be positioned in the middle of a wide char it cannot just reprint the char to get there. * Fix plodput so it correctly counts the number of output characters for wide characters. * Fix slk routines to properly size the wctomb() buffer. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libcurses/add_wchstr.c cvs rdiff -u -r1.60 -r1.61 src/lib/libcurses/addbytes.c cvs rdiff -u -r1.27 -r1.28 src/lib/libcurses/background.c \ src/lib/libcurses/clrtobot.c cvs rdiff -u -r1.21 -r1.22 src/lib/libcurses/border.c \ src/lib/libcurses/ins_wstr.c cvs rdiff -u -r1.32 -r1.33 src/lib/libcurses/clrtoeol.c cvs rdiff -u -r1.37 -r1.38 src/lib/libcurses/cr_put.c cvs rdiff -u -r1.76 -r1.77 src/lib/libcurses/curses_private.h cvs rdiff -u -r1.26 -r1.27 src/lib/libcurses/delch.c \ src/lib/libcurses/insch.c cvs rdiff -u -r1.33 -r1.34 src/lib/libcurses/erase.c \ src/lib/libcurses/resize.c cvs rdiff -u -r1.7 -r1.8 src/lib/libcurses/in_wch.c cvs rdiff -u -r1.9 -r1.10 src/lib/libcurses/in_wchstr.c \ src/lib/libcurses/insstr.c src/lib/libcurses/inwstr.c cvs rdiff -u -r1.17 -r1.18 src/lib/libcurses/ins_wch.c cvs rdiff -u -r1.19 -r1.20 src/lib/libcurses/insdelln.c cvs rdiff -u -r1.63 -r1.64 src/lib/libcurses/newwin.c cvs rdiff -u -r1.117 -r1.118 src/lib/libcurses/refresh.c cvs rdiff -u -r1.18 -r1.19 src/lib/libcurses/slk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: blymn Date: Tue Jan 25 03:23:05 UTC 2022 Modified Files: src/tests/lib/libcurses: debug_test t_curses.sh src/tests/lib/libcurses/check_files: add_wch3.chk get_wstr.chk getn_wstr.chk ins_wch1.chk ins_wch2.chk ins_wch3.chk mvins_wch.chk wget_wstr.chk wgetn_wstr.chk wins_wch1.chk wins_wch2.chk wins_wch3.chk wvline_set.chk src/tests/lib/libcurses/tests: add_wch ins_wch overwrite Log Message: Update of tests to account for output changes associated with wide char fixes. Also, default all tests to using UTF8 instead of doing a special dance for the wide character tests and fix debug_test to force set the locale to UTF8 so tests under debug don't throw spurious mismatches when a wide character test is run. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libcurses/debug_test cvs rdiff -u -r1.25 -r1.26 src/tests/lib/libcurses/t_curses.sh cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/add_wch3.chk \ src/tests/lib/libcurses/check_files/get_wstr.chk \ src/tests/lib/libcurses/check_files/getn_wstr.chk \ src/tests/lib/libcurses/check_files/ins_wch1.chk \ src/tests/lib/libcurses/check_files/ins_wch2.chk \ src/tests/lib/libcurses/check_files/ins_wch3.chk \ src/tests/lib/libcurses/check_files/mvins_wch.chk \ src/tests/lib/libcurses/check_files/wget_wstr.chk \ src/tests/lib/libcurses/check_files/wgetn_wstr.chk \ src/tests/lib/libcurses/check_files/wins_wch1.chk \ src/tests/lib/libcurses/check_files/wins_wch2.chk \ src/tests/lib/libcurses/check_files/wins_wch3.chk \ src/tests/lib/libcurses/check_files/wvline_set.chk cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/tests/add_wch cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/ins_wch \ src/tests/lib/libcurses/tests/overwrite Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libcurses
Module Name:src
Committed By: blymn
Date: Tue Jan 25 03:23:05 UTC 2022
Modified Files:
src/tests/lib/libcurses: debug_test t_curses.sh
src/tests/lib/libcurses/check_files: add_wch3.chk get_wstr.chk
getn_wstr.chk ins_wch1.chk ins_wch2.chk ins_wch3.chk mvins_wch.chk
wget_wstr.chk wgetn_wstr.chk wins_wch1.chk wins_wch2.chk
wins_wch3.chk wvline_set.chk
src/tests/lib/libcurses/tests: add_wch ins_wch overwrite
Log Message:
Update of tests to account for output changes associated with wide char
fixes. Also, default all tests to using UTF8 instead of doing a special
dance for the wide character tests and fix debug_test to force set the
locale to UTF8 so tests under debug don't throw spurious mismatches
when a wide character test is run.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libcurses/debug_test
cvs rdiff -u -r1.25 -r1.26 src/tests/lib/libcurses/t_curses.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/add_wch3.chk \
src/tests/lib/libcurses/check_files/get_wstr.chk \
src/tests/lib/libcurses/check_files/getn_wstr.chk \
src/tests/lib/libcurses/check_files/ins_wch1.chk \
src/tests/lib/libcurses/check_files/ins_wch2.chk \
src/tests/lib/libcurses/check_files/ins_wch3.chk \
src/tests/lib/libcurses/check_files/mvins_wch.chk \
src/tests/lib/libcurses/check_files/wget_wstr.chk \
src/tests/lib/libcurses/check_files/wgetn_wstr.chk \
src/tests/lib/libcurses/check_files/wins_wch1.chk \
src/tests/lib/libcurses/check_files/wins_wch2.chk \
src/tests/lib/libcurses/check_files/wins_wch3.chk \
src/tests/lib/libcurses/check_files/wvline_set.chk
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libcurses/tests/add_wch
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/ins_wch \
src/tests/lib/libcurses/tests/overwrite
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/debug_test
diff -u src/tests/lib/libcurses/debug_test:1.5 src/tests/lib/libcurses/debug_test:1.6
--- src/tests/lib/libcurses/debug_test:1.5 Fri Jun 4 23:07:39 2021
+++ src/tests/lib/libcurses/debug_test Tue Jan 25 03:23:05 2022
@@ -9,6 +9,10 @@ export INCLUDE_PATH
#
CURSES_TRACE_FILE="/tmp/ctrace"
SLAVE="${BASEDIR}/slave"
+#
+# Force localisation to UTF-8 to be consistent with atf runs
+#
+export LC_ALL=en_US.UTF-8
usage() {
echo "Set up the environment to run the test frame. Option flags:"
Index: src/tests/lib/libcurses/t_curses.sh
diff -u src/tests/lib/libcurses/t_curses.sh:1.25 src/tests/lib/libcurses/t_curses.sh:1.26
--- src/tests/lib/libcurses/t_curses.sh:1.25 Fri Dec 31 20:22:49 2021
+++ src/tests/lib/libcurses/t_curses.sh Tue Jan 25 03:23:05 2022
@@ -1,19 +1,16 @@
h_run()
{
+ TEST_LOCALE=en_US.UTF-8
+
file=$1
- if [ -z "$2" ]; then
- export LC_ALL=C
- r_run $file
+ locale=`locale -a | grep -i ${TEST_LOCALE}`
+ if [ -z "${locale}" ]; then
+ atf_fail "test ${file} failed because locale ${locale} not available"
else
- locale=`locale -a | grep -i $2`
- if [ -z "${locale}" ]; then
- atf_fail "test ${file} failed because locale ${locale} not available"
- else
- # export the locale and shift the parameters by two and pass the rest
- export LC_ALL=$locale
- shift 2
- r_run $file $@
- fi
+ # export the locale and shift the parameters by two and pass the rest
+ export LC_ALL=$locale
+ shift 2
+ r_run $file $@
fi
}
@@ -234,7 +231,7 @@ addwstr_head()
}
addwstr_body()
{
-h_run addwstr en_US.UTF-8
+h_run addwstr
}
atf_test_case waddstr
@@ -254,7 +251,7 @@ waddwstr_head()
}
waddwstr_body()
{
-h_run waddwstr en_US.UTF-8
+h_run waddwstr
}
atf_test_case addnstr
@@ -274,7 +271,7 @@ addnwstr_head()
}
addnwstr_body()
{
-h_run addnwstr en_US.UTF-8
+h_run addnwstr
}
atf_test_case waddnstr
@@ -294,7 +291,7 @@ waddnwstr_head()
}
waddnwstr_body()
{
-h_run waddnwstr en_US.UTF-8
+h_run waddnwstr
}
atf_test_case mvwaddnwstr
@@ -304,7 +301,7 @@ mvwaddnwstr_head()
}
mvwaddnwstr_body()
{
-h_run mvwaddnwstr en_US.UTF-8
+h_run mvwaddnwstr
}
atf_test_case mvaddstr
@@ -324,7 +321,7 @@ mvaddwstr_head()
}
mvaddwstr_body()
{
-h_run mvaddwstr en_US.UTF-8
+h_run mvaddwstr
}
atf_test_case mvwaddwstr
@@ -334,7 +331,7 @@ mvwaddwstr_head()
}
mvwaddwstr_body()
{
-h_run mvwaddwstr en_US.UTF-8
+h_run mvwaddwstr
}
atf_test_case mvwaddstr
@@ -344,7 +341,7 @@ mvwaddstr_head()
}
mvwaddstr_body()
{
-h_run mvwaddstr en_US.UTF-8
+h_run mvwaddstr
}
atf_test_case mvaddnstr
@@ -364,7 +361,7 @@ mvaddnwstr_head()
}
mvaddnwstr_body()
{
-h_run mvaddnwstr en_US.UTF-8
+h_run mvaddnwstr
}
atf_test_case mvwaddnstr
@@ -384,7 +381,7 @@ add_wch_head()
}
add_wch_body()
{
- h_run add_wch en_US.UTF-8
+ h_run add_wch
}
atf_test_case wadd_wch
@@ -394,7 +391,7 @@ wadd_wch_head
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Tue Jan 25 03:40:29 UTC 2022 Modified Files: src/sys/dev/pci/ixgbe: ixgbe_netbsd.h Log Message: Fix compile error for non __HAVE_ATOMIC64_LOADSTORE arch. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ixgbe/ixgbe_netbsd.h diff -u src/sys/dev/pci/ixgbe/ixgbe_netbsd.h:1.15 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h:1.16 --- src/sys/dev/pci/ixgbe/ixgbe_netbsd.h:1.15 Tue Jan 25 01:56:22 2022 +++ src/sys/dev/pci/ixgbe/ixgbe_netbsd.h Tue Jan 25 03:40:29 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe_netbsd.h,v 1.15 2022/01/25 01:56:22 msaitoh Exp $ */ +/* $NetBSD: ixgbe_netbsd.h,v 1.16 2022/01/25 03:40:29 msaitoh Exp $ */ /* * Copyright (c) 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -61,9 +61,9 @@ atomic_store_relaxed(&((evp)->ev_count), \ atomic_load_relaxed(&((evp)->ev_count)) + (val)) #else -#define IXGBE_EVC_LOAD(evp) ((ev)->ev_count)) -#define IXGBE_EVC_STORE(evp, val) ((ev)->ev_count = (val)) -#define IXGBE_EVC_ADD(evp, val) ((ev)->ev_count += (val)) +#define IXGBE_EVC_LOAD(evp) ((evp)->ev_count)) +#define IXGBE_EVC_STORE(evp, val) ((evp)->ev_count = (val)) +#define IXGBE_EVC_ADD(evp, val) ((evp)->ev_count += (val)) #endif #define IXGBE_EVC_REGADD(hw, stats, regname, evname) \
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Tue Jan 25 03:40:29 UTC 2022 Modified Files: src/sys/dev/pci/ixgbe: ixgbe_netbsd.h Log Message: Fix compile error for non __HAVE_ATOMIC64_LOADSTORE arch. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
