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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
@@ -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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
@@ -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 08:34:35 msaitoh Exp $ */
+/* $NetBSD: udf_subr.c,v 1.164 2022/01/24 09:42:14 andvar Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.163 2022/01/01 08:34:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.164 2022/01/24 09:42:14 andvar Exp $");
#endif /* not lint */
@@ -5514,7 +5514,7 @@ udf_loadvnode(struct mount *mp, struct v
* sure the chain is maintained.
*
* `needs_indirect' flags if the next location is to be filled with
- * with an indirect entry.
+ * an indirect entry.
*/
udf_node->write_loc = icb_loc;
udf_node->needs_indirect = needs_indirect;
Index: src/sys/kern/subr_cpu.c
diff -u src/sys/kern/subr_cpu.c:1.17 src/sys/kern/subr_cpu.c:1.18
--- src/sys/kern/subr_cpu.c:1.17 Mon Oct 4 21:02:39 2021
+++ src/sys/kern/subr_cpu.c Mon Jan 24 09:42:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cpu.c,v 1.17 2021/10/04 21:02:39 andvar Exp $ */
+/* $NetBSD: subr_cpu.c,v 1.18 2022/01/24 09:42:14 andvar Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019, 2020
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cpu.c,v 1.17 2021/10/04 21:02:39 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cpu.c,v 1.18 2022/01/24 09:42:14 andvar Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -450,7 +450,7 @@ cpu_count(enum cpu_count idx, int64_t de
/*
* Fetch fresh sum total for all counts. Expensive - don't call often.
*
- * If poll is true, the caller is okay with with less recent values (but
+ * If poll is true, the caller is okay with less recent values (but
* no more than 1/hz seconds old). Where this is called very often that
* should be the case.
*
