aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Spörlein <uqs@FreeBSD.org>2012-01-07 16:09:33 +0000
committerUlrich Spörlein <uqs@FreeBSD.org>2012-01-07 16:09:33 +0000
commit4b85a12f7142f8086e98f2b9b748d304b76a4b58 (patch)
treefae895b09014d4ae2ae2cdaf825a995dde64c138
parentdabfce9a5a40b4733c79f8421c42856b98d0409b (diff)
downloadsrc-4b85a12f7142f8086e98f2b9b748d304b76a4b58.tar.gz
src-4b85a12f7142f8086e98f2b9b748d304b76a4b58.zip
Spelling fixes for sbin/
Notes
Notes: svn path=/head/; revision=229778
-rw-r--r--sbin/bsdlabel/bsdlabel.c10
-rw-r--r--sbin/camcontrol/camcontrol.c2
-rw-r--r--sbin/devfs/rule.c2
-rw-r--r--sbin/dhclient/dhclient-script.82
-rw-r--r--sbin/dhclient/options.c4
-rw-r--r--sbin/fsck_ffs/fsck.h2
-rw-r--r--sbin/fsck_ffs/fsutil.c2
-rw-r--r--sbin/hastctl/hastctl.82
-rw-r--r--sbin/hastd/activemap.c4
-rw-r--r--sbin/hastd/hast_compression.c2
-rw-r--r--sbin/hastd/hastd.c2
-rw-r--r--sbin/hastd/lzf.h4
-rw-r--r--sbin/hastd/primary.c2
-rw-r--r--sbin/hastd/proto.c4
-rw-r--r--sbin/ifconfig/ifieee80211.c2
-rw-r--r--sbin/ipfw/ipfw2.c8
-rw-r--r--sbin/ipfw/main.c2
-rw-r--r--sbin/mdmfs/mdmfs.c2
-rw-r--r--sbin/mount_nfs/mount_nfs.c2
-rw-r--r--sbin/ping6/ping6.c2
-rw-r--r--sbin/reboot/nextboot.82
-rw-r--r--sbin/routed/main.c4
-rw-r--r--sbin/routed/radix.c4
-rw-r--r--sbin/routed/table.c2
24 files changed, 37 insertions, 37 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index a7cc2a2d4bd6..24d852b22a21 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -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.
*/
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index ce12926dc52e..1366061d009e 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -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"
diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c
index e4726d78a234..bb3ebe107c10 100644
--- a/sbin/devfs/rule.c
+++ b/sbin/devfs/rule.c
@@ -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,
diff --git a/sbin/dhclient/dhclient-script.8 b/sbin/dhclient/dhclient-script.8
index 89d43cb76d49..fdb46a7774b7 100644
--- a/sbin/dhclient/dhclient-script.8
+++ b/sbin/dhclient/dhclient-script.8
@@ -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
diff --git a/sbin/dhclient/options.c b/sbin/dhclient/options.c
index 17643e767284..be073dae39cd 100644
--- a/sbin/dhclient/options.c
+++ b/sbin/dhclient/options.c
@@ -284,8 +284,8 @@ find_search_domain_name_len(struct option_data *option, int *offset)
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.");
diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h
index 4e30a7e6393b..6ac004e4fb52 100644
--- a/sbin/fsck_ffs/fsck.h
+++ b/sbin/fsck_ffs/fsck.h
@@ -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:
diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c
index 85ea03352685..59b73c81ad21 100644
--- a/sbin/fsck_ffs/fsutil.c
+++ b/sbin/fsck_ffs/fsutil.c
@@ -717,7 +717,7 @@ dofix(struct inodesc *idesc, const char *msg)
#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.
*/
diff --git a/sbin/hastctl/hastctl.8 b/sbin/hastctl/hastctl.8
index 8ec2843ea9cc..31353ca58ae0 100644
--- a/sbin/hastctl/hastctl.8
+++ b/sbin/hastctl/hastctl.8
@@ -97,7 +97,7 @@ If extent size is too small, there will be too much disk activity
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 .
diff --git a/sbin/hastd/activemap.c b/sbin/hastd/activemap.c
index e388bb2eea34..64b95e347620 100644
--- a/sbin/hastd/activemap.c
+++ b/sbin/hastd/activemap.c
@@ -219,7 +219,7 @@ keepdirty_add(struct activemap *amp, int extent)
kd = keepdirty_find(amp, extent);
if (kd != NULL) {
/*
- * Only move element at the begining.
+ * Only move element at the beginning.
*/
TAILQ_REMOVE(&amp->am_keepdirty, kd, kd_next);
TAILQ_INSERT_HEAD(&amp->am_keepdirty, kd, kd_next);
@@ -573,7 +573,7 @@ activemap_sync_rewind(struct activemap *amp)
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;
}
diff --git a/sbin/hastd/hast_compression.c b/sbin/hastd/hast_compression.c
index 4f4a93a59ea5..f524eb1ad4aa 100644
--- a/sbin/hastd/hast_compression.c
+++ b/sbin/hastd/hast_compression.c
@@ -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.
*/
diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c
index fdb1c5b99081..e2f1f8c6cb53 100644
--- a/sbin/hastd/hastd.c
+++ b/sbin/hastd/hastd.c
@@ -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).",
diff --git a/sbin/hastd/lzf.h b/sbin/hastd/lzf.h
index 92fdd0ff4a15..d9563efa3f1a 100644
--- a/sbin/hastd/lzf.h
+++ b/sbin/hastd/lzf.h
@@ -146,7 +146,7 @@ lzf_decompress (const void *const in_data, unsigned int in_len,
/*
* 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_data, unsigned int in_len,
* 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
diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c
index 243269d39715..4dbfc0649295 100644
--- a/sbin/hastd/primary.c
+++ b/sbin/hastd/primary.c
@@ -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);
diff --git a/sbin/hastd/proto.c b/sbin/hastd/proto.c
index 72c8c75d27da..452f82f0e124 100644
--- a/sbin/hastd/proto.c
+++ b/sbin/hastd/proto.c
@@ -131,7 +131,7 @@ proto_common_setup(const char *srcaddr, const char *dstaddr,
/*
* 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, const char *dstaddr,
return (-1);
}
if (ret > 0) {
- /* An error occured. */
+ /* An error occurred. */
errno = ret;
return (-1);
}
diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index a84c5bf4661a..1cfc623b67d2 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -884,7 +884,7 @@ set80211wepkey(const char *val, int d, int s, const struct afswtch *rafp)
}
/*
- * 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.
*/
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index 615c4d1292d5..6b0e0f0b54b8 100644
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@@ -454,8 +454,8 @@ _substrcmp(const char *str1, const char* str2)
* 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);
diff --git a/sbin/ipfw/main.c b/sbin/ipfw/main.c
index debed4e82116..82a299bbd58d 100644
--- a/sbin/ipfw/main.c
+++ b/sbin/ipfw/main.c
@@ -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;
diff --git a/sbin/mdmfs/mdmfs.c b/sbin/mdmfs/mdmfs.c
index e0932652be1e..66a6911a5499 100644
--- a/sbin/mdmfs/mdmfs.c
+++ b/sbin/mdmfs/mdmfs.c
@@ -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");
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 9da313719699..c6235e08f279 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -788,7 +788,7 @@ getnfsargs(char *spec, struct iovec **iov, int *iovlen)
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) {
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index e01bf5cbbac6..a49ed5d814bf 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -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) {
diff --git a/sbin/reboot/nextboot.8 b/sbin/reboot/nextboot.8
index 765fa796fe04..99986b1204ff 100644
--- a/sbin/reboot/nextboot.8
+++ b/sbin/reboot/nextboot.8
@@ -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
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 85bc9e8d3675..1658d2e48cd8 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -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;
diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c
index 7685f782bac8..5365e6d83636 100644
--- a/sbin/routed/radix.c
+++ b/sbin/routed/radix.c
@@ -97,7 +97,7 @@ static struct radix_node *rn_match(void *v_arg, struct radix_node_head *head);
* 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.
diff --git a/sbin/routed/table.c b/sbin/routed/table.c
index 8054a49b3404..ec369890c33a 100644
--- a/sbin/routed/table.c
+++ b/sbin/routed/table.c
@@ -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;