Module Name: src Committed By: wiz Date: Tue Feb 9 23:05:16 UTC 2010
Modified Files: src/crypto/dist/ipsec-tools/src/racoon: pfkey.c proposal.h src/sys/arch/atari/atari: intr.c src/sys/arch/atari/dev: ite_cc.c ite_et.c src/sys/arch/sparc64/sparc64: locore.s src/sys/kern: uipc_usrreq.c src/usr.bin/xlint/lint1: cgram.y Log Message: Fix typo in comment. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/crypto/dist/ipsec-tools/src/racoon/pfkey.c cvs rdiff -u -r1.6 -r1.7 src/crypto/dist/ipsec-tools/src/racoon/proposal.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/atari/atari/intr.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/atari/dev/ite_cc.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/atari/dev/ite_et.c cvs rdiff -u -r1.311 -r1.312 src/sys/arch/sparc64/sparc64/locore.s cvs rdiff -u -r1.128 -r1.129 src/sys/kern/uipc_usrreq.c cvs rdiff -u -r1.48 -r1.49 src/usr.bin/xlint/lint1/cgram.y Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/dist/ipsec-tools/src/racoon/pfkey.c diff -u src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.51 src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.52 --- src/crypto/dist/ipsec-tools/src/racoon/pfkey.c:1.51 Thu Sep 3 09:29:07 2009 +++ src/crypto/dist/ipsec-tools/src/racoon/pfkey.c Tue Feb 9 23:05:16 2010 @@ -1,6 +1,6 @@ -/* $NetBSD: pfkey.c,v 1.51 2009/09/03 09:29:07 tteras Exp $ */ +/* $NetBSD: pfkey.c,v 1.52 2010/02/09 23:05:16 wiz Exp $ */ -/* $Id: pfkey.c,v 1.51 2009/09/03 09:29:07 tteras Exp $ */ +/* $Id: pfkey.c,v 1.52 2010/02/09 23:05:16 wiz Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -3554,7 +3554,7 @@ #endif /* - * send error against acquire message to kenrel. + * send error against acquire message to kernel. */ int pk_sendeacquire(iph2) Index: src/crypto/dist/ipsec-tools/src/racoon/proposal.h diff -u src/crypto/dist/ipsec-tools/src/racoon/proposal.h:1.6 src/crypto/dist/ipsec-tools/src/racoon/proposal.h:1.7 --- src/crypto/dist/ipsec-tools/src/racoon/proposal.h:1.6 Sat Dec 9 05:52:57 2006 +++ src/crypto/dist/ipsec-tools/src/racoon/proposal.h Tue Feb 9 23:05:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: proposal.h,v 1.6 2006/12/09 05:52:57 manu Exp $ */ +/* $NetBSD: proposal.h,v 1.7 2010/02/09 23:05:16 wiz Exp $ */ /* Id: proposal.h,v 1.5 2004/06/11 16:00:17 ludvigm Exp */ @@ -88,7 +88,7 @@ int reqid_out; /* request id (outbound) */ int reqid_in; /* request id (inbound) */ - int ok; /* if 1, success to set SA in kenrel */ + int ok; /* if 1, success to set SA in kernel */ struct satrns *head; /* header of transform */ struct saproto *next; /* next protocol */ Index: src/sys/arch/atari/atari/intr.c diff -u src/sys/arch/atari/atari/intr.c:1.19 src/sys/arch/atari/atari/intr.c:1.20 --- src/sys/arch/atari/atari/intr.c:1.19 Wed Jul 8 12:23:09 2009 +++ src/sys/arch/atari/atari/intr.c Tue Feb 9 23:05:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.19 2009/07/08 12:23:09 tsutsui Exp $ */ +/* $NetBSD: intr.c,v 1.20 2010/02/09 23:05:16 wiz Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.19 2009/07/08 12:23:09 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.20 2010/02/09 23:05:16 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -167,7 +167,7 @@ /* * Normally, all settable vectors are already * re-routed to the intr_glue() function. The - * marvelous exeption to these are the HBL/VBL + * marvelous exception to these are the HBL/VBL * interrupts. They happen *very* often and * can't be turned off on the Falcon. So they * are normally vectored to an 'rte' instruction. Index: src/sys/arch/atari/dev/ite_cc.c diff -u src/sys/arch/atari/dev/ite_cc.c:1.34 src/sys/arch/atari/dev/ite_cc.c:1.35 --- src/sys/arch/atari/dev/ite_cc.c:1.34 Sun Jul 19 05:43:22 2009 +++ src/sys/arch/atari/dev/ite_cc.c Tue Feb 9 23:05:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ite_cc.c,v 1.34 2009/07/19 05:43:22 tsutsui Exp $ */ +/* $NetBSD: ite_cc.c,v 1.35 2010/02/09 23:05:16 wiz Exp $ */ /* * Copyright (c) 1996 Leo Weppelman @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.34 2009/07/19 05:43:22 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.35 2010/02/09 23:05:16 wiz Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -211,7 +211,7 @@ maj = cdevsw_lookup_major(&grf_cdevsw); /* - * Handle exeption case: early console init + * Handle exception case: early console init */ if(dp == NULL) { congrf.g_unit = cfdata_grf->cf_unit; Index: src/sys/arch/atari/dev/ite_et.c diff -u src/sys/arch/atari/dev/ite_et.c:1.27 src/sys/arch/atari/dev/ite_et.c:1.28 --- src/sys/arch/atari/dev/ite_et.c:1.27 Tue Oct 20 19:10:10 2009 +++ src/sys/arch/atari/dev/ite_et.c Tue Feb 9 23:05:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ite_et.c,v 1.27 2009/10/20 19:10:10 snj Exp $ */ +/* $NetBSD: ite_et.c,v 1.28 2010/02/09 23:05:16 wiz Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.27 2009/10/20 19:10:10 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.28 2010/02/09 23:05:16 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -185,7 +185,7 @@ maj = cdevsw_lookup_major(&grf_cdevsw); /* - * Handle exeption case: early console init + * Handle exception case: early console init */ if(dp == NULL) { congrf.g_unit = cfdata_grf->cf_unit; Index: src/sys/arch/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.311 src/sys/arch/sparc64/sparc64/locore.s:1.312 --- src/sys/arch/sparc64/sparc64/locore.s:1.311 Sat Feb 6 00:23:30 2010 +++ src/sys/arch/sparc64/sparc64/locore.s Tue Feb 9 23:05:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.311 2010/02/06 00:23:30 mrg Exp $ */ +/* $NetBSD: locore.s,v 1.312 2010/02/09 23:05:16 wiz Exp $ */ /* * Copyright (c) 1996-2002 Eduardo Horvath @@ -693,7 +693,7 @@ UTRAP(0x004) ! 004 = SIR -- ROM should get this UTRAP(0x005) ! 005 = RED state exception UTRAP(0x006); UTRAP(0x007) - VTRAP(T_INST_EXCEPT, textfault) ! 008 = instr. access exept + VTRAP(T_INST_EXCEPT, textfault) ! 008 = instr. access except VTRAP(T_TEXTFAULT, textfault) ! 009 = instr access MMU miss VTRAP(T_INST_ERROR, textfault) ! 00a = instr. access err UTRAP(0x00b); UTRAP(0x00c); UTRAP(0x00d); UTRAP(0x00e); UTRAP(0x00f) @@ -948,7 +948,7 @@ UTRAP(0x005) ! 005 = RED state exception UTRAP(0x006); UTRAP(0x007) ktextfault: - VTRAP(T_INST_EXCEPT, textfault) ! 008 = instr. access exept + VTRAP(T_INST_EXCEPT, textfault) ! 008 = instr. access except VTRAP(T_TEXTFAULT, textfault) ! 009 = instr access MMU miss -- no MMU VTRAP(T_INST_ERROR, textfault) ! 00a = instr. access err UTRAP(0x00b); UTRAP(0x00c); UTRAP(0x00d); UTRAP(0x00e); UTRAP(0x00f) Index: src/sys/kern/uipc_usrreq.c diff -u src/sys/kern/uipc_usrreq.c:1.128 src/sys/kern/uipc_usrreq.c:1.129 --- src/sys/kern/uipc_usrreq.c:1.128 Fri Jan 8 11:35:10 2010 +++ src/sys/kern/uipc_usrreq.c Tue Feb 9 23:05:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_usrreq.c,v 1.128 2010/01/08 11:35:10 pooka Exp $ */ +/* $NetBSD: uipc_usrreq.c,v 1.129 2010/02/09 23:05:16 wiz Exp $ */ /*- * Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.128 2010/01/08 11:35:10 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.129 2010/02/09 23:05:16 wiz Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -454,7 +454,7 @@ * is not locked, so when changing so2->so_lock * another thread can grab it while so->so_lock is still * pointing to the (locked) uipc_lock. - * this should be harmless, exept that this makes + * this should be harmless, except that this makes * solocked2() and solocked() unreliable. * Another problem is that unp_setaddr() expects the * the socket locked. Grabing sotounpcb(so2)->unp_streamlock Index: src/usr.bin/xlint/lint1/cgram.y diff -u src/usr.bin/xlint/lint1/cgram.y:1.48 src/usr.bin/xlint/lint1/cgram.y:1.49 --- src/usr.bin/xlint/lint1/cgram.y:1.48 Sat Oct 3 17:09:18 2009 +++ src/usr.bin/xlint/lint1/cgram.y Tue Feb 9 23:05:16 2010 @@ -1,5 +1,5 @@ %{ -/* $NetBSD: cgram.y,v 1.48 2009/10/03 17:09:18 christos Exp $ */ +/* $NetBSD: cgram.y,v 1.49 2010/02/09 23:05:16 wiz Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved. @@ -35,7 +35,7 @@ #include <sys/cdefs.h> #if defined(__RCSID) && !defined(lint) -__RCSID("$NetBSD: cgram.y,v 1.48 2009/10/03 17:09:18 christos Exp $"); +__RCSID("$NetBSD: cgram.y,v 1.49 2010/02/09 23:05:16 wiz Exp $"); #endif #include <stdlib.h> @@ -53,7 +53,7 @@ /* * level for memory allocation. Normaly the same as blklev. - * An exeption is the declaration of arguments in prototypes. Memory + * An exception is the declaration of arguments in prototypes. Memory * for these can't be freed after the declaration, but symbols must * be removed from the symbol table after the declaration. */