Module Name: src Committed By: mbalmer Date: Mon Oct 17 16:35:23 UTC 2011
Modified Files: src/dist/dhcp/includes/cf: aix.h src/dist/dhcp/server: dhcp.c src/dist/pf/sbin/pfctl: pfctl_parser.c src/distrib/utils/sysinst: mbr.c util.c src/sys/dev/usb: if_atu.c src/tests/toolchain/cc: t_hello.sh Log Message: There is no doubt whether whether should have a 'h' after the 'w'. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/dist/dhcp/includes/cf/aix.h cvs rdiff -u -r1.12 -r1.13 src/dist/dhcp/server/dhcp.c cvs rdiff -u -r1.10 -r1.11 src/dist/pf/sbin/pfctl/pfctl_parser.c cvs rdiff -u -r1.87 -r1.88 src/distrib/utils/sysinst/mbr.c cvs rdiff -u -r1.169 -r1.170 src/distrib/utils/sysinst/util.c cvs rdiff -u -r1.40 -r1.41 src/sys/dev/usb/if_atu.c cvs rdiff -u -r1.5 -r1.6 src/tests/toolchain/cc/t_hello.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/dist/dhcp/includes/cf/aix.h diff -u src/dist/dhcp/includes/cf/aix.h:1.2 src/dist/dhcp/includes/cf/aix.h:1.3 --- src/dist/dhcp/includes/cf/aix.h:1.2 Thu Aug 11 17:13:26 2005 +++ src/dist/dhcp/includes/cf/aix.h Mon Oct 17 16:35:23 2011 @@ -77,7 +77,7 @@ extern int h_errno; #define va_dcl /* The vsnprint function definition in /usr/include/ appears to use this - * as a key for wether or not it should be declared. Seems reasoanble for + * as a key for whether or not it should be declared. Seems reasoanble for * us to use the same key. */ #if (_XOPEN_SOURCE != 500) Index: src/dist/dhcp/server/dhcp.c diff -u src/dist/dhcp/server/dhcp.c:1.12 src/dist/dhcp/server/dhcp.c:1.13 --- src/dist/dhcp/server/dhcp.c:1.12 Mon Aug 15 21:12:43 2011 +++ src/dist/dhcp/server/dhcp.c Mon Oct 17 16:35:23 2011 @@ -34,7 +34,7 @@ #ifndef lint static char copyright[] = -"$Id: dhcp.c,v 1.12 2011/08/15 21:12:43 christos Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n"; +"$Id: dhcp.c,v 1.13 2011/10/17 16:35:23 mbalmer Exp $ Copyright (c) 2004-2005 Internet Systems Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -2688,7 +2688,7 @@ void ack_lease (packet, lease, offer, wh lease -> timestamp = cur_time; icmp_echorequest (&lease -> ip_addr); - /* Determine wether to use configured or default ping timeout. + /* Determine whether to use configured or default ping timeout. */ if ((oc = lookup_option (&server_universe, state -> options, SV_PING_TIMEOUT)) && Index: src/dist/pf/sbin/pfctl/pfctl_parser.c diff -u src/dist/pf/sbin/pfctl/pfctl_parser.c:1.10 src/dist/pf/sbin/pfctl/pfctl_parser.c:1.11 --- src/dist/pf/sbin/pfctl/pfctl_parser.c:1.10 Wed Jun 18 09:06:26 2008 +++ src/dist/pf/sbin/pfctl/pfctl_parser.c Mon Oct 17 16:35:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pfctl_parser.c,v 1.10 2008/06/18 09:06:26 yamt Exp $ */ +/* $NetBSD: pfctl_parser.c,v 1.11 2011/10/17 16:35:22 mbalmer Exp $ */ /* $OpenBSD: pfctl_parser.c,v 1.234 2006/10/31 23:46:24 mcbride Exp $ */ /* @@ -1230,7 +1230,7 @@ ifa_exists(const char *ifa_name) if (iftab == NULL) ifa_load(); - /* check wether this is a group */ + /* check whether this is a group */ #ifndef __NetBSD__ /* XXXPF TODO investigate what's needed for NetBSD */ if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1) Index: src/distrib/utils/sysinst/mbr.c diff -u src/distrib/utils/sysinst/mbr.c:1.87 src/distrib/utils/sysinst/mbr.c:1.88 --- src/distrib/utils/sysinst/mbr.c:1.87 Mon May 30 14:20:48 2011 +++ src/distrib/utils/sysinst/mbr.c Mon Oct 17 16:35:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mbr.c,v 1.87 2011/05/30 14:20:48 joerg Exp $ */ +/* $NetBSD: mbr.c,v 1.88 2011/10/17 16:35:22 mbalmer Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -1399,7 +1399,7 @@ validate_and_set_names(mbr_info_t *mbri, const unsigned char *p; /* - * The 16 bit magic used to detect wether mbr_bootsel is valid + * The 16 bit magic used to detect whether mbr_bootsel is valid * or not is pretty week - collisions have been seen in the wild; * but maybe it is just foreign tools corruption reminiscents * of NetBSD MBRs. Anyway, before accepting a boot menu definition, Index: src/distrib/utils/sysinst/util.c diff -u src/distrib/utils/sysinst/util.c:1.169 src/distrib/utils/sysinst/util.c:1.170 --- src/distrib/utils/sysinst/util.c:1.169 Mon Apr 4 08:30:14 2011 +++ src/distrib/utils/sysinst/util.c Mon Oct 17 16:35:22 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.169 2011/04/04 08:30:14 mbalmer Exp $ */ +/* $NetBSD: util.c,v 1.170 2011/10/17 16:35:22 mbalmer Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -486,7 +486,7 @@ set_cd_select(menudesc *m, void *arg) } /* - * Check wether we can remove the boot media. + * Check whether we can remove the boot media. * If it is not a local filesystem, return -1. * If we can not decide for sure (can not tell MD content from plain ffs * on hard disk, for example), return 0. Index: src/sys/dev/usb/if_atu.c diff -u src/sys/dev/usb/if_atu.c:1.40 src/sys/dev/usb/if_atu.c:1.41 --- src/sys/dev/usb/if_atu.c:1.40 Wed Nov 3 22:28:31 2010 +++ src/sys/dev/usb/if_atu.c Mon Oct 17 16:35:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_atu.c,v 1.40 2010/11/03 22:28:31 dyoung Exp $ */ +/* $NetBSD: if_atu.c,v 1.41 2011/10/17 16:35:21 mbalmer Exp $ */ /* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */ /* * Copyright (c) 2003, 2004 @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.40 2010/11/03 22:28:31 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.41 2011/10/17 16:35:21 mbalmer Exp $"); #include <sys/param.h> @@ -493,7 +493,7 @@ atu_start_scan(struct atu_softc *sc) /* the time we stay on one channel */ USETW(Scan.MinChannelTime, 100); USETW(Scan.MaxChannelTime, 200); - /* wether or not we scan all channels */ + /* whether or not we scan all channels */ Scan.InternationalScan = 0xc1; #ifdef ATU_DEBUG Index: src/tests/toolchain/cc/t_hello.sh diff -u src/tests/toolchain/cc/t_hello.sh:1.5 src/tests/toolchain/cc/t_hello.sh:1.6 --- src/tests/toolchain/cc/t_hello.sh:1.5 Tue Oct 4 12:01:21 2011 +++ src/tests/toolchain/cc/t_hello.sh Mon Oct 17 16:35:22 2011 @@ -1,4 +1,4 @@ -# $NetBSD: t_hello.sh,v 1.5 2011/10/04 12:01:21 martin Exp $ +# $NetBSD: t_hello.sh,v 1.6 2011/10/17 16:35:22 mbalmer Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -73,7 +73,7 @@ EOF } hello32_body() { - # check wether this arch is 64bit + # check whether this arch is 64bit if ! cc -dM -E - < /dev/null | fgrep -q _LP64; then atf_skip "this is not a 64 bit architecture" fi