Module Name: src
Committed By: maya
Date: Fri Mar 30 22:54:37 UTC 2018
Modified Files:
src/sys/dev/tc: stic.c
src/sys/kern: sysv_msg.c
src/sys/netinet: ip_output.c sctp_output.c
Log Message:
correct typo: and and -> and (comments only)
heads up on this being a common typo from chris28.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/tc/stic.c
cvs rdiff -u -r1.71 -r1.72 src/sys/kern/sysv_msg.c
cvs rdiff -u -r1.298 -r1.299 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.12 -r1.13 src/sys/netinet/sctp_output.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/tc/stic.c
diff -u src/sys/dev/tc/stic.c:1.52 src/sys/dev/tc/stic.c:1.53
--- src/sys/dev/tc/stic.c:1.52 Wed Jan 24 05:35:58 2018
+++ src/sys/dev/tc/stic.c Fri Mar 30 22:54:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: stic.c,v 1.52 2018/01/24 05:35:58 riastradh Exp $ */
+/* $NetBSD: stic.c,v 1.53 2018/03/30 22:54:36 maya Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.52 2018/01/24 05:35:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.53 2018/03/30 22:54:36 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -421,7 +421,7 @@ stic_attach(device_t self, struct stic_i
/*
* Allocate backing for the console. We could trawl back through
- * msgbuf and and fill the backing, but it's not worth the hassle.
+ * msgbuf and fill the backing, but it's not worth the hassle.
* We could also grab backing using pmap_steal_memory() early on,
* but that's a little ugly.
*/
Index: src/sys/kern/sysv_msg.c
diff -u src/sys/kern/sysv_msg.c:1.71 src/sys/kern/sysv_msg.c:1.72
--- src/sys/kern/sysv_msg.c:1.71 Mon Sep 5 14:13:50 2016
+++ src/sys/kern/sysv_msg.c Fri Mar 30 22:54:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sysv_msg.c,v 1.71 2016/09/05 14:13:50 christos Exp $ */
+/* $NetBSD: sysv_msg.c,v 1.72 2018/03/30 22:54:37 maya Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_msg.c,v 1.71 2016/09/05 14:13:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_msg.c,v 1.72 2018/03/30 22:54:37 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -315,8 +315,8 @@ msgrealloc(int newmsgmni, int newmsgseg)
memcpy(nmptr, mptr, sizeof(struct msqid_ds));
/*
- * Go through the message headers, and and copy each
- * one by taking the new ones, and thus defragmenting.
+ * Go through the message headers, and copy each one
+ * by taking the new ones, and thus defragmenting.
*/
nmsghdr = pmsghdr = NULL;
msghdr = mptr->_msg_first;
Index: src/sys/netinet/ip_output.c
diff -u src/sys/netinet/ip_output.c:1.298 src/sys/netinet/ip_output.c:1.299
--- src/sys/netinet/ip_output.c:1.298 Sat Mar 3 09:39:29 2018
+++ src/sys/netinet/ip_output.c Fri Mar 30 22:54:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_output.c,v 1.298 2018/03/03 09:39:29 maxv Exp $ */
+/* $NetBSD: ip_output.c,v 1.299 2018/03/30 22:54:37 maya Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.298 2018/03/03 09:39:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_output.c,v 1.299 2018/03/30 22:54:37 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -548,7 +548,7 @@ ip_output(struct mbuf *m0, struct mbuf *
}
/*
- * Look for broadcast address and and verify user is allowed to
+ * Look for broadcast address and verify user is allowed to
* send such a packet.
*/
if (isbroadcast) {
Index: src/sys/netinet/sctp_output.c
diff -u src/sys/netinet/sctp_output.c:1.12 src/sys/netinet/sctp_output.c:1.13
--- src/sys/netinet/sctp_output.c:1.12 Sun Dec 10 11:52:14 2017
+++ src/sys/netinet/sctp_output.c Fri Mar 30 22:54:37 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sctp_output.c,v 1.12 2017/12/10 11:52:14 rjs Exp $ */
+/* $NetBSD: sctp_output.c,v 1.13 2018/03/30 22:54:37 maya Exp $ */
/* $KAME: sctp_output.c,v 1.48 2005/06/16 18:29:24 jinmei Exp $ */
/*
@@ -30,7 +30,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.12 2017/12/10 11:52:14 rjs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_output.c,v 1.13 2018/03/30 22:54:37 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -7669,7 +7669,7 @@ sctp_send_sack(struct sctp_tcb *stcb)
/*
* Queue up a SACK in the control queue. We must first check to
* see if a SACK is somehow on the control queue. If so, we will
- * take and and remove the old one.
+ * take and remove the old one.
*/
struct sctp_association *asoc;
struct sctp_tmit_chunk *chk, *a_chk;
