summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libc/i386/string/memchr.S2
-rw-r--r--lib/libc/i386/string/strchr.S4
-rw-r--r--lib/libc/i386/string/strrchr.S4
-rw-r--r--lib/libc/stdlib/realpath.c2
-rw-r--r--lib/libz/zlib.h2
-rw-r--r--sys/arm/include/sysarch.h2
-rw-r--r--sys/arm/xscale/ixp425/ixp425_npe.c2
-rw-r--r--sys/cam/scsi/scsi_pass.c2
-rw-r--r--sys/cam/scsi/scsi_target.c2
-rw-r--r--sys/dev/cxgb/common/cxgb_t3_hw.c2
-rw-r--r--sys/dev/msk/if_msk.c2
-rw-r--r--sys/dev/ppbus/ppbconf.c2
-rw-r--r--sys/dev/rndtest/rndtest.c2
-rw-r--r--sys/kern/vfs_mount.c2
-rw-r--r--sys/ufs/ffs/ffs_balloc.c2
-rw-r--r--tools/regression/usr.bin/yacc/grammar.y2
-rw-r--r--tools/regression/usr.bin/yacc/regress.08.out2
-rw-r--r--usr.sbin/ppp/command.c2
18 files changed, 20 insertions, 20 deletions
diff --git a/lib/libc/i386/string/memchr.S b/lib/libc/i386/string/memchr.S
index 03828db..3bd4d9c 100644
--- a/lib/libc/i386/string/memchr.S
+++ b/lib/libc/i386/string/memchr.S
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
/*
* memchr (b, c, len)
- * locates the first occurance of c in string b.
+ * locates the first occurrence of c in string b.
*
* Written by:
* J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S
index 57fc6dd..f57c2cd 100644
--- a/lib/libc/i386/string/strchr.S
+++ b/lib/libc/i386/string/strchr.S
@@ -33,11 +33,11 @@ __FBSDID("$FreeBSD$");
/*
* strchr(s, c)
- * return a pointer to the first occurance of the character c in
+ * return a pointer to the first occurrence of the character c in
* string s, or NULL if c does not occur in the string.
*
* %edx - pointer iterating through string
- * %eax - pointer to first occurance of 'c'
+ * %eax - pointer to first occurrence of 'c'
* %cl - character we're comparing against
* %bl - character at %edx
*
diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S
index 29942c4..5ec5287 100644
--- a/lib/libc/i386/string/strrchr.S
+++ b/lib/libc/i386/string/strrchr.S
@@ -33,11 +33,11 @@ __FBSDID("$FreeBSD$");
/*
* strrchr(s, c)
- * return a pointer to the last occurance of the character c in
+ * return a pointer to the last occurrence of the character c in
* string s, or NULL if c does not occur in the string.
*
* %edx - pointer iterating through string
- * %eax - pointer to last occurance of 'c'
+ * %eax - pointer to last occurrence of 'c'
* %cl - character we're comparing against
* %bl - character at %edx
*
diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c
index 8fd5457..a2a9329 100644
--- a/lib/libc/stdlib/realpath.c
+++ b/lib/libc/stdlib/realpath.c
@@ -139,7 +139,7 @@ realpath(const char * __restrict path, char * __restrict resolved)
* Only the trailing slashes are not covered
* by other checks in the loop, but we verify
* the prefix for any (rare) "//" or "/\0"
- * occurence to not implement lookahead.
+ * occurrence to not implement lookahead.
*/
if (lstat(resolved, &sb) != 0) {
if (m)
diff --git a/lib/libz/zlib.h b/lib/libz/zlib.h
index 3edf3ac..7e19bc0 100644
--- a/lib/libz/zlib.h
+++ b/lib/libz/zlib.h
@@ -846,7 +846,7 @@ ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
available input is skipped. No output is provided.
inflateSync searches for a 00 00 FF FF pattern in the compressed data.
- All full flush points have this pattern, but not all occurences of this
+ All full flush points have this pattern, but not all occurrences of this
pattern are full flush points.
inflateSync returns Z_OK if a possible full flush point has been found,
diff --git a/sys/arm/include/sysarch.h b/sys/arm/include/sysarch.h
index b0de6db..95d0211 100644
--- a/sys/arm/include/sysarch.h
+++ b/sys/arm/include/sysarch.h
@@ -47,7 +47,7 @@
* update the cpu_switch() (and cpu_throw()) code as well.
* In addition, code in arm/include/atomic.h and arm/include/asmacros.h
* assumes that ARM_RAS_END is at ARM_RAS_START+4, so be sure to update those
- * if ARM_RAS_END moves in relation to ARM_RAS_START (look for occurrances
+ * if ARM_RAS_END moves in relation to ARM_RAS_START (look for occurrences
* of ldr/str rm,[rn, #4]).
*/
diff --git a/sys/arm/xscale/ixp425/ixp425_npe.c b/sys/arm/xscale/ixp425/ixp425_npe.c
index da8384d..0ccc7d0 100644
--- a/sys/arm/xscale/ixp425/ixp425_npe.c
+++ b/sys/arm/xscale/ixp425/ixp425_npe.c
@@ -419,7 +419,7 @@ ixpnpe_stop(struct ixpnpe_softc *sc)
/*
* Indicates the start of an NPE Image, in new NPE Image Library format.
- * 2 consecutive occurances indicates the end of the NPE Image Library
+ * 2 consecutive occurrences indicates the end of the NPE Image Library
*/
#define NPE_IMAGE_MARKER 0xfeedf00d
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index 56bb17c..eb5a57d 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -694,7 +694,7 @@ passsendccb(struct cam_periph *periph, union ccb *ccb, union ccb *inccb)
* match CCBs. For the SCSI, ATA and ADVINFO CCBs, we only pass the
* CCB in if there's actually data to map. cam_periph_mapmem() will
* do the right thing, even if there isn't data to map, but since CCBs
- * without data are a reasonably common occurance (e.g. test unit
+ * without data are a reasonably common occurrence (e.g. test unit
* ready), it will save a few cycles if we check for it here.
*
* XXX What happens if a sg list is supplied? We don't filter that
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 963b4e6..56ff8a9 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -734,7 +734,7 @@ targsendccb(struct targ_softc *softc, union ccb *ccb,
* match CCBs. For the SCSI CCBs, we only pass the CCB in if
* there's actually data to map. cam_periph_mapmem() will do the
* right thing, even if there isn't data to map, but since CCBs
- * without data are a reasonably common occurance (e.g. test unit
+ * without data are a reasonably common occurrence (e.g. test unit
* ready), it will save a few cycles if we check for it here.
*/
if (((ccb_h->flags & CAM_DATA_MASK) == CAM_DATA_VADDR)
diff --git a/sys/dev/cxgb/common/cxgb_t3_hw.c b/sys/dev/cxgb/common/cxgb_t3_hw.c
index 9ad7379..32aab35 100644
--- a/sys/dev/cxgb/common/cxgb_t3_hw.c
+++ b/sys/dev/cxgb/common/cxgb_t3_hw.c
@@ -1727,7 +1727,7 @@ struct intr_info {
* @reg: the interrupt status register to process
* @mask: a mask to apply to the interrupt status
* @acts: table of interrupt actions
- * @stats: statistics counters tracking interrupt occurences
+ * @stats: statistics counters tracking interrupt occurrences
*
* A table driven interrupt handler that applies a set of masks to an
* interrupt status word and performs the corresponding actions if the
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c
index 664575c..3c5aab5 100644
--- a/sys/dev/msk/if_msk.c
+++ b/sys/dev/msk/if_msk.c
@@ -3526,7 +3526,7 @@ msk_intr_hwerr(struct msk_softc *sc)
* On PCI Express bus bridges are called root complexes (RC).
* PCI Express errors are recognized by the root complex too,
* which requests the system to handle the problem. After
- * error occurence it may be that no access to the adapter
+ * error occurrence it may be that no access to the adapter
* may be performed any longer.
*/
diff --git a/sys/dev/ppbus/ppbconf.c b/sys/dev/ppbus/ppbconf.c
index 65a26e0..ef513c1 100644
--- a/sys/dev/ppbus/ppbconf.c
+++ b/sys/dev/ppbus/ppbconf.c
@@ -172,7 +172,7 @@ static char *pnp_classes[] = {
/*
* search_token()
*
- * Search the first occurence of a token within a string
+ * Search the first occurrence of a token within a string
*/
static char *
search_token(char *str, int slen, char *token)
diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c
index 4e42aa8..13ecdd6 100644
--- a/sys/dev/rndtest/rndtest.c
+++ b/sys/dev/rndtest/rndtest.c
@@ -360,7 +360,7 @@ rndtest_chi_4(struct rndtest_state *rsp)
for (i = 0; i < RNDTEST_CHI4_K; i++)
freq[i] = 0;
- /* Get number of occurances of each 4 bit pattern */
+ /* Get number of occurrences of each 4 bit pattern */
for (i = 0; i < RNDTEST_NBYTES; i++) {
freq[(rsp->rs_buf[i] >> 4) & RNDTEST_CHI4_K_MASK]++;
freq[(rsp->rs_buf[i] >> 0) & RNDTEST_CHI4_K_MASK]++;
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index c1ed6c9..448fdbb 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -232,7 +232,7 @@ vfs_equalopts(const char *opt1, const char *opt2)
/*
* If a mount option is specified several times,
* (with or without the "no" prefix) only keep
- * the last occurence of it.
+ * the last occurrence of it.
*/
static void
vfs_sanitizeopts(struct vfsoptlist *opts)
diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c
index 771f8eb..c57c5e3 100644
--- a/sys/ufs/ffs/ffs_balloc.c
+++ b/sys/ufs/ffs/ffs_balloc.c
@@ -453,7 +453,7 @@ fail:
* We have to sync it at the end so that the soft updates code
* does not find any untracked changes. Although this is really
* slow, running out of disk space is not expected to be a common
- * occurence. The error return from fsync is ignored as we already
+ * occurrence. The error return from fsync is ignored as we already
* have an error to return to the user.
*
* XXX Still have to journal the free below
diff --git a/tools/regression/usr.bin/yacc/grammar.y b/tools/regression/usr.bin/yacc/grammar.y
index 6755522..a2f1883 100644
--- a/tools/regression/usr.bin/yacc/grammar.y
+++ b/tools/regression/usr.bin/yacc/grammar.y
@@ -1027,7 +1027,7 @@ extern char *yytext;
extern FILE *yyin, *yyout;
static int curly; /* number of curly brace nesting levels */
-static int ly_count; /* number of occurances of %% */
+static int ly_count; /* number of occurrences of %% */
static int inc_depth; /* include nesting level */
static SymbolTable *included_files; /* files already included */
static int yy_start = 0; /* start state number */
diff --git a/tools/regression/usr.bin/yacc/regress.08.out b/tools/regression/usr.bin/yacc/regress.08.out
index 86e93e7..c86f19f 100644
--- a/tools/regression/usr.bin/yacc/regress.08.out
+++ b/tools/regression/usr.bin/yacc/regress.08.out
@@ -847,7 +847,7 @@ extern char *yytext;
extern FILE *yyin, *yyout;
static int curly; /* number of curly brace nesting levels */
-static int ly_count; /* number of occurances of %% */
+static int ly_count; /* number of occurrences of %% */
static int inc_depth; /* include nesting level */
static SymbolTable *included_files; /* files already included */
static int yy_start = 0; /* start state number */
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index 91fe028..6bdf0c9 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -416,7 +416,7 @@ DialCommand(struct cmdargs const *arg)
static char *
strstrword(char *big, const char *little)
{
- /* Get the first occurrance of the word ``little'' in ``big'' */
+ /* Get the first occurrence of the word ``little'' in ``big'' */
char *pos;
int len;
OpenPOWER on IntegriCloud