svn commit: r229778 - in head/sbin: bsdlabel camcontrol devfs
dhclient fsck_ffs hastctl hastd ifconfig ipfw mdmfs mount_nfs
ping6 reboot routed
Ulrich Spoerlein
uqs at FreeBSD.org
Sat Jan 7 16:09:34 UTC 2012
Author: uqs
Date: Sat Jan 7 16:09:33 2012
New Revision: 229778
URL: http://svn.freebsd.org/changeset/base/229778
Log:
Spelling fixes for sbin/
Modified:
head/sbin/bsdlabel/bsdlabel.c
head/sbin/camcontrol/camcontrol.c
head/sbin/devfs/rule.c
head/sbin/dhclient/dhclient-script.8
head/sbin/dhclient/options.c
head/sbin/fsck_ffs/fsck.h
head/sbin/fsck_ffs/fsutil.c
head/sbin/hastctl/hastctl.8
head/sbin/hastd/activemap.c
head/sbin/hastd/hast_compression.c
head/sbin/hastd/hastd.c
head/sbin/hastd/lzf.h
head/sbin/hastd/primary.c
head/sbin/hastd/proto.c
head/sbin/ifconfig/ifieee80211.c
head/sbin/ipfw/ipfw2.c
head/sbin/ipfw/main.c
head/sbin/mdmfs/mdmfs.c
head/sbin/mount_nfs/mount_nfs.c
head/sbin/ping6/ping6.c
head/sbin/reboot/nextboot.8
head/sbin/routed/main.c
head/sbin/routed/radix.c
head/sbin/routed/table.c
Modified: head/sbin/bsdlabel/bsdlabel.c
==============================================================================
--- head/sbin/bsdlabel/bsdlabel.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/bsdlabel/bsdlabel.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -189,8 +189,8 @@ main(int argc, char *argv[])
break;
case 'r':
/*
- * We accept and ignode -r for compatibility with
- * historically disklabel usage.
+ * We accept and ignore -r for compatibility with
+ * historical disklabel usage.
*/
break;
case 'w':
@@ -386,7 +386,7 @@ writelabel(void)
struct disklabel *lp = &lab;
if (disable_write) {
- warnx("write to disk label supressed - label was as follows:");
+ warnx("write to disk label suppressed - label was as follows:");
display(stdout, NULL);
return (0);
}
@@ -1512,8 +1512,8 @@ getvirginlabel(void)
loclab.d_secperunit = mediasize / secsize;
/*
- * Nobody in these enligthened days uses the CHS geometry for
- * anything, but nontheless try to get it right. If we fail
+ * Nobody in these enlightened days uses the CHS geometry for
+ * anything, but nonetheless try to get it right. If we fail
* to get any good ideas from the device, construct something
* which is IBM-PC friendly.
*/
Modified: head/sbin/camcontrol/camcontrol.c
==============================================================================
--- head/sbin/camcontrol/camcontrol.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/camcontrol/camcontrol.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -5732,7 +5732,7 @@ usage(int verbose)
"defects arguments:\n"
"-f format specify defect list format (block, bfi or phys)\n"
"-G get the grown defect list\n"
-"-P get the permanant defect list\n"
+"-P get the permanent defect list\n"
"inquiry arguments:\n"
"-D get the standard inquiry data\n"
"-S get the serial number\n"
Modified: head/sbin/devfs/rule.c
==============================================================================
--- head/sbin/devfs/rule.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/devfs/rule.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$");
#include "extern.h"
-static void rulespec_infp(FILE *fp, unsigned long reqest, devfs_rsnum rsnum);
+static void rulespec_infp(FILE *fp, unsigned long request, devfs_rsnum rsnum);
static void rulespec_instr(struct devfs_rule *dr, const char *str,
devfs_rsnum rsnum);
static void rulespec_intok(struct devfs_rule *dr, int ac, char **av,
Modified: head/sbin/dhclient/dhclient-script.8
==============================================================================
--- head/sbin/dhclient/dhclient-script.8 Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/dhclient/dhclient-script.8 Sat Jan 7 16:09:33 2012 (r229778)
@@ -232,7 +232,7 @@ will check for the existence of
.Pa /etc/dhclient-exit-hooks .
If found, it will be sourced
.Pq see Xr sh 1 .
-These hooks scripts can be used to dynamically modify the enviornment at
+These hooks scripts can be used to dynamically modify the environment at
appropriate times during the DHCP negotiations.
For example, if the administrator wishes to disable alias IP numbers on
the DHCP interface, they might want to put the following in
Modified: head/sbin/dhclient/options.c
==============================================================================
--- head/sbin/dhclient/options.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/dhclient/options.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -284,8 +284,8 @@ find_search_domain_name_len(struct optio
option->data[i + 1];
if (pointer >= *offset) {
/*
- * The pointer must indicates a prior
- * occurance.
+ * The pointer must indicate a prior
+ * occurrence.
*/
warning("Invalid forward pointer in DHCP "
"Domain Search option compression.");
Modified: head/sbin/fsck_ffs/fsck.h
==============================================================================
--- head/sbin/fsck_ffs/fsck.h Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/fsck_ffs/fsck.h Sat Jan 7 16:09:33 2012 (r229778)
@@ -220,7 +220,7 @@ struct inodesc {
* To check if a block has been found as a duplicate it is only
* necessary to search from duplist through muldup. To find the
* total number of times that a block has been found as a duplicate
- * the entire list must be searched for occurences of the block
+ * the entire list must be searched for occurrences of the block
* in question. The following diagram shows a sample list where
* w (found twice), x (found once), y (found three times), and z
* (found once) are duplicate block numbers:
Modified: head/sbin/fsck_ffs/fsutil.c
==============================================================================
--- head/sbin/fsck_ffs/fsutil.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/fsck_ffs/fsutil.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -717,7 +717,7 @@ dofix(struct inodesc *idesc, const char
#include <stdarg.h>
/*
- * An unexpected inconsistency occured.
+ * An unexpected inconsistency occurred.
* Die if preening or file system is running with soft dependency protocol,
* otherwise just print message and continue.
*/
Modified: head/sbin/hastctl/hastctl.8
==============================================================================
--- head/sbin/hastctl/hastctl.8 Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/hastctl/hastctl.8 Sat Jan 7 16:09:33 2012 (r229778)
@@ -97,7 +97,7 @@ If extent size is too small, there will
related to dirty map updates, which will degrade performance of the
given resource.
If extent size is too large, synchronization, even in case of short
-outage, can take a long time increasing the risk of loosing up-to-date
+outage, can take a long time increasing the risk of losing up-to-date
node before synchronization process is completed.
The default extent size is
.Va 2MB .
Modified: head/sbin/hastd/activemap.c
==============================================================================
--- head/sbin/hastd/activemap.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/hastd/activemap.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -219,7 +219,7 @@ keepdirty_add(struct activemap *amp, int
kd = keepdirty_find(amp, extent);
if (kd != NULL) {
/*
- * Only move element at the begining.
+ * Only move element at the beginning.
*/
TAILQ_REMOVE(&->am_keepdirty, kd, kd_next);
TAILQ_INSERT_HEAD(&->am_keepdirty, kd, kd_next);
@@ -573,7 +573,7 @@ activemap_sync_rewind(struct activemap *
return;
}
/*
- * Mark that we want to start synchronization from the begining.
+ * Mark that we want to start synchronization from the beginning.
*/
amp->am_syncoff = -1;
}
Modified: head/sbin/hastd/hast_compression.c
==============================================================================
--- head/sbin/hastd/hast_compression.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/hastd/hast_compression.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -55,7 +55,7 @@ allzeros(const void *data, size_t size)
* Because inside the loop we don't check at every step, we would
* get an answer only after walking through entire buffer.
* To return early if the buffer doesn't contain all zeros, we probe
- * 8 bytes at the begining, in the middle and at the end of the buffer
+ * 8 bytes at the beginning, in the middle and at the end of the buffer
* first.
*/
Modified: head/sbin/hastd/hastd.c
==============================================================================
--- head/sbin/hastd/hastd.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/hastd/hastd.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -786,7 +786,7 @@ listen_accept(struct hastd_listen *lst)
pjdlog_debug(2, "%s: resource=%s", raddr, resname);
token = nv_get_uint8_array(nvin, &size, "token");
/*
- * NULL token means that this is first conection.
+ * NULL token means that this is first connection.
*/
if (token != NULL && size != sizeof(res->hr_token)) {
pjdlog_error("Received token of invalid size from %s (expected %zu, got %zu).",
Modified: head/sbin/hastd/lzf.h
==============================================================================
--- head/sbin/hastd/lzf.h Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/hastd/lzf.h Sat Jan 7 16:09:33 2012 (r229778)
@@ -146,7 +146,7 @@ lzf_decompress (const void *const in_dat
/*
* Avoid assigning values to errno variable? for some embedding purposes
- * (linux kernel for example), this is neccessary. NOTE: this breaks
+ * (linux kernel for example), this is necessary. NOTE: this breaks
* the documentation in lzf.h.
*/
#ifndef AVOID_ERRNO
@@ -167,7 +167,7 @@ lzf_decompress (const void *const in_dat
* and return EINVAL if the input stream has been corrupted. This
* only shields against overflowing the input buffer and will not
* detect most corrupted streams.
- * This check is not normally noticable on modern hardware
+ * This check is not normally noticeable on modern hardware
* (<1% slowdown), but might slow down older cpus considerably.
*/
#ifndef CHECK_INPUT
Modified: head/sbin/hastd/primary.c
==============================================================================
--- head/sbin/hastd/primary.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/hastd/primary.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -933,7 +933,7 @@ hastd_primary(struct hast_resource *res)
/*
* Create the guard thread first, so we can handle signals from the
- * very begining.
+ * very beginning.
*/
error = pthread_create(&td, NULL, guard_thread, res);
PJDLOG_ASSERT(error == 0);
Modified: head/sbin/hastd/proto.c
==============================================================================
--- head/sbin/hastd/proto.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/hastd/proto.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -131,7 +131,7 @@ proto_common_setup(const char *srcaddr,
/*
* ret == 0 - success
* ret == -1 - dstaddr is not for this protocol
- * ret > 0 - right protocol, but an error occured
+ * ret > 0 - right protocol, but an error occurred
*/
if (ret >= 0)
break;
@@ -142,7 +142,7 @@ proto_common_setup(const char *srcaddr,
return (-1);
}
if (ret > 0) {
- /* An error occured. */
+ /* An error occurred. */
errno = ret;
return (-1);
}
Modified: head/sbin/ifconfig/ifieee80211.c
==============================================================================
--- head/sbin/ifconfig/ifieee80211.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/ifconfig/ifieee80211.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -884,7 +884,7 @@ set80211wepkey(const char *val, int d, i
}
/*
- * This function is purely a NetBSD compatability interface. The NetBSD
+ * This function is purely a NetBSD compatibility interface. The NetBSD
* interface is too inflexible, but it's there so we'll support it since
* it's not all that hard.
*/
Modified: head/sbin/ipfw/ipfw2.c
==============================================================================
--- head/sbin/ipfw/ipfw2.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/ipfw/ipfw2.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -454,8 +454,8 @@ _substrcmp(const char *str1, const char*
* of the first. A warning is printed to stderr in the case that the
* first string does not match the third.
*
- * This function exists to warn about the bizzare construction
- * strncmp(str, "by", 2) which is used to allow people to use a shotcut
+ * This function exists to warn about the bizarre construction
+ * strncmp(str, "by", 2) which is used to allow people to use a shortcut
* for "bytes". The problem is that in addition to accepting "by",
* "byt", "byte", and "bytes", it also excepts "by_rabid_dogs" and any
* other string beginning with "by".
@@ -2866,9 +2866,9 @@ chkarg:
((struct sockaddr_in*)&result)->sin_addr.s_addr =
INADDR_ANY;
} else {
- /*
+ /*
* Resolve the host name or address to a family and a
- * network representation of the addres.
+ * network representation of the address.
*/
if (getaddrinfo(*av, NULL, NULL, &res))
errx(EX_DATAERR, NULL);
Modified: head/sbin/ipfw/main.c
==============================================================================
--- head/sbin/ipfw/main.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/ipfw/main.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -167,7 +167,7 @@ ipfw_main(int oldac, char **oldav)
i++;
bcopy(arg+j, av_p, i-j);
av[ac] = av_p;
- av_p += i-j; /* the lenght of the string */
+ av_p += i-j; /* the length of the string */
*av_p++ = '\0';
ac++;
j = i + 1;
Modified: head/sbin/mdmfs/mdmfs.c
==============================================================================
--- head/sbin/mdmfs/mdmfs.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/mdmfs/mdmfs.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -632,7 +632,7 @@ run(int *ofd, const char *cmdline, ...)
* loop.
*/
(void)fprintf(stderr, "DEBUG: running:");
- /* Should be equivilent to 'cmd' (before strsep, of course). */
+ /* Should be equivalent to 'cmd' (before strsep, of course). */
for (i = 0; argv[i] != NULL; i++)
(void)fprintf(stderr, " %s", argv[i]);
(void)fprintf(stderr, "\n");
Modified: head/sbin/mount_nfs/mount_nfs.c
==============================================================================
--- head/sbin/mount_nfs/mount_nfs.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/mount_nfs/mount_nfs.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -788,7 +788,7 @@ getnfsargs(char *spec, struct iovec **io
for (;;) {
/*
* Try each entry returned by getaddrinfo(). Note the
- * occurence of remote errors by setting `remoteerr'.
+ * occurrence of remote errors by setting `remoteerr'.
*/
remoteerr = 0;
for (ai = ai_nfs; ai != NULL; ai = ai->ai_next) {
Modified: head/sbin/ping6/ping6.c
==============================================================================
--- head/sbin/ping6/ping6.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/ping6/ping6.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -1166,7 +1166,7 @@ main(int argc, char *argv[])
/*
* receive control messages only. Process the
- * exceptions (currently the only possiblity is
+ * exceptions (currently the only possibility is
* a path MTU notification.)
*/
if ((mtu = get_pathmtu(&m)) > 0) {
Modified: head/sbin/reboot/nextboot.8
==============================================================================
--- head/sbin/reboot/nextboot.8 Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/reboot/nextboot.8 Sat Jan 7 16:09:33 2012 (r229778)
@@ -117,7 +117,7 @@ The
.Nm
code is implemented in the
.Xr loader 8 .
-It is not the most throughly tested code.
+It is not the most thoroughly tested code.
It is also my first attempt to write in Forth.
.Pp
Finally, it does some evil things like writing to the file system before it
Modified: head/sbin/routed/main.c
==============================================================================
--- head/sbin/routed/main.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/routed/main.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -414,7 +414,7 @@ usage:
continue;
}
- /* Check the kernel table occassionally for mysteriously
+ /* Check the kernel table occasionally for mysteriously
* evaporated routes
*/
timevalsub(&t2, &flush_kern_timer, &now);
@@ -446,7 +446,7 @@ usage:
* the previous update was finished.
* Even if we just started after discovering
* a 2nd interface or were otherwise delayed,
- * pick a 30-second aniversary of the
+ * pick a 30-second anniversary of the
* original broadcast time.
*/
n = 1 + (0-t2.tv_sec)/SUPPLY_INTERVAL;
Modified: head/sbin/routed/radix.c
==============================================================================
--- head/sbin/routed/radix.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/routed/radix.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -97,7 +97,7 @@ static struct radix_node *rn_match(void
* node as high in the tree as we can go.
*
* The present version of the code makes use of normal routes in short-
- * circuiting an explict mask and compare operation when testing whether
+ * circuiting an explicit mask and compare operation when testing whether
* a key satisfies a normal route, and also in remembering the unique leaf
* that governs a subtree.
*/
@@ -247,7 +247,7 @@ rn_match(void *v_arg,
*
* In this case, we have a complete match of the key. Unless
* the node is one of the roots, we are finished.
- * If it is the zeros root, then take what we have, prefering
+ * If it is the zeros root, then take what we have, preferring
* any real data.
* If it is the ones root, then pretend the target key was followed
* by a byte of zeros.
Modified: head/sbin/routed/table.c
==============================================================================
--- head/sbin/routed/table.c Sat Jan 7 14:39:45 2012 (r229777)
+++ head/sbin/routed/table.c Sat Jan 7 16:09:33 2012 (r229778)
@@ -2071,7 +2071,7 @@ walk_age(struct radix_node *rn,
/* try to switch to an alternative */
rtswitch(RT, 0);
- /* Delete a dead route after it has been publically mourned. */
+ /* Delete a dead route after it has been publicly mourned. */
if (now_garbage > RT->rt_time) {
rtdelete(RT);
return 0;
More information about the svn-src-head
mailing list