The branch main has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=5666643a95389e3ea7637b86cc556d411242f71e
commit 5666643a95389e3ea7637b86cc556d411242f71e Author: Gordon Bergling <[email protected]> AuthorDate: 2021-03-13 17:26:15 +0000 Commit: Gordon Bergling <[email protected]> CommitDate: 2021-03-13 17:26:15 +0000 Fix some common typos in comments - occured -> occurred - normaly -> normally - controling -> controlling - fileds -> fields - insterted -> inserted - outputing -> outputting MFC after: 1 week --- lib/libipsec/pfkey.c | 48 ++++++++++++++++++------------------- stand/efi/include/efifs.h | 2 +- sys/dev/ixl/ixl_pf_i2c.c | 40 +++++++++++++++---------------- sys/fs/nfsclient/nfs_clrpcops.c | 4 ++-- sys/mips/ingenic/jz4780_regs.h | 6 ++--- sys/net/if_pfsync.h | 2 +- sys/netinet/tcp_log_buf.h | 6 ++--- sys/netinet/tcp_stacks/bbr.c | 8 +++---- sys/netinet/tcp_stacks/rack.c | 2 +- sys/netinet/tcp_stacks/tcp_rack.h | 2 +- tools/test/stress2/misc/nullfs17.sh | 2 +- usr.bin/ar/write.c | 4 ++-- usr.bin/fmt/fmt.c | 2 +- 13 files changed, 64 insertions(+), 64 deletions(-) diff --git a/lib/libipsec/pfkey.c b/lib/libipsec/pfkey.c index d1aae7321c2e..08098775910f 100644 --- a/lib/libipsec/pfkey.c +++ b/lib/libipsec/pfkey.c @@ -342,7 +342,7 @@ pfkey_get_softrate(type) * sending SADB_GETSPI message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_getspi(so, satype, mode, src, dst, min, max, reqid, seq) @@ -471,7 +471,7 @@ pfkey_send_getspi(so, satype, mode, src, dst, min, max, reqid, seq) * The length of key material is a_keylen + e_keylen. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_update(so, satype, mode, src, dst, spi, reqid, wsize, @@ -502,7 +502,7 @@ pfkey_send_update(so, satype, mode, src, dst, spi, reqid, wsize, * The length of key material is a_keylen + e_keylen. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_add(so, satype, mode, src, dst, spi, reqid, wsize, @@ -532,7 +532,7 @@ pfkey_send_add(so, satype, mode, src, dst, spi, reqid, wsize, * sending SADB_DELETE message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_delete(so, satype, mode, src, dst, spi) @@ -555,7 +555,7 @@ pfkey_send_delete(so, satype, mode, src, dst, spi) * * OUT: * positive: success and return length sent - * -1 : error occured, and set errno + * -1 : error occurred, and set errno */ int pfkey_send_delete_all(so, satype, mode, src, dst) @@ -637,7 +637,7 @@ pfkey_send_delete_all(so, satype, mode, src, dst) * sending SADB_GET message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_get(so, satype, mode, src, dst, spi) @@ -657,7 +657,7 @@ pfkey_send_get(so, satype, mode, src, dst, spi) * sending SADB_REGISTER message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_register(so, satype) @@ -699,7 +699,7 @@ pfkey_send_register(so, satype) * sadb_supported returned into ipsec_supported. * OUT: * 0: success and return length sent. - * -1: error occured, and set errno. + * -1: error occurred, and set errno. */ int pfkey_recv_register(so) @@ -739,7 +739,7 @@ pfkey_recv_register(so) * tlen: msg length, it's to makeing sure. * OUT: * 0: success and return length sent. - * -1: error occured, and set errno. + * -1: error occurred, and set errno. */ int pfkey_set_supported(msg, tlen) @@ -803,7 +803,7 @@ pfkey_set_supported(msg, tlen) * sending SADB_FLUSH message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_flush(so, satype) @@ -822,7 +822,7 @@ pfkey_send_flush(so, satype) * sending SADB_DUMP message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_dump(so, satype) @@ -844,8 +844,8 @@ pfkey_send_dump(so, satype) * flag: set promisc off if zero, set promisc on if non-zero. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. - * 0 : error occured, and set errno. + * -1 : error occurred, and set errno. + * 0 : error occurred, and set errno. * others: a pointer to new allocated buffer in which supported * algorithms is. */ @@ -866,7 +866,7 @@ pfkey_send_promisc_toggle(so, flag) * sending SADB_X_SPDADD message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_spdadd(so, src, prefs, dst, prefd, proto, policy, policylen, seq) @@ -892,7 +892,7 @@ pfkey_send_spdadd(so, src, prefs, dst, prefd, proto, policy, policylen, seq) * sending SADB_X_SPDADD message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_spdadd2(so, src, prefs, dst, prefd, proto, ltime, vtime, @@ -920,7 +920,7 @@ pfkey_send_spdadd2(so, src, prefs, dst, prefd, proto, ltime, vtime, * sending SADB_X_SPDUPDATE message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_spdupdate(so, src, prefs, dst, prefd, proto, policy, policylen, seq) @@ -946,7 +946,7 @@ pfkey_send_spdupdate(so, src, prefs, dst, prefd, proto, policy, policylen, seq) * sending SADB_X_SPDUPDATE message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_spdupdate2(so, src, prefs, dst, prefd, proto, ltime, vtime, @@ -974,7 +974,7 @@ pfkey_send_spdupdate2(so, src, prefs, dst, prefd, proto, ltime, vtime, * sending SADB_X_SPDDELETE message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_spddelete(so, src, prefs, dst, prefd, proto, policy, policylen, seq) @@ -1005,7 +1005,7 @@ pfkey_send_spddelete(so, src, prefs, dst, prefd, proto, policy, policylen, seq) * sending SADB_X_SPDDELETE message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_spddelete2(so, spid) @@ -1024,7 +1024,7 @@ pfkey_send_spddelete2(so, spid) * sending SADB_X_SPDGET message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_spdget(so, spid) @@ -1043,7 +1043,7 @@ pfkey_send_spdget(so, spid) * sending SADB_X_SPDSETIDX message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_spdsetidx(so, src, prefs, dst, prefd, proto, policy, policylen, seq) @@ -1074,7 +1074,7 @@ pfkey_send_spdsetidx(so, src, prefs, dst, prefd, proto, policy, policylen, seq) * sending SADB_SPDFLUSH message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_spdflush(so) @@ -1092,7 +1092,7 @@ pfkey_send_spdflush(so) * sending SADB_SPDDUMP message to the kernel. * OUT: * positive: success and return length sent. - * -1 : error occured, and set errno. + * -1 : error occurred, and set errno. */ int pfkey_send_spddump(so) @@ -1658,7 +1658,7 @@ pfkey_close(so) * receive sadb_msg data, and return pointer to new buffer allocated. * Must free this buffer later. * OUT: - * NULL : error occured. + * NULL : error occurred. * others : a pointer to sadb_msg structure. * * XXX should be rewritten to pass length explicitly diff --git a/stand/efi/include/efifs.h b/stand/efi/include/efifs.h index 58febb66eb75..76aa93d6d07f 100644 --- a/stand/efi/include/efifs.h +++ b/stand/efi/include/efifs.h @@ -29,7 +29,7 @@ Revision History // -// EFI Partition header (normaly starts in LBA 1) +// EFI Partition header (normally starts in LBA 1) // #define EFI_PARTITION_SIGNATURE 0x5053595320494249 diff --git a/sys/dev/ixl/ixl_pf_i2c.c b/sys/dev/ixl/ixl_pf_i2c.c index 9aea32bbe5ce..c69e2f8ac836 100644 --- a/sys/dev/ixl/ixl_pf_i2c.c +++ b/sys/dev/ixl/ixl_pf_i2c.c @@ -2,30 +2,30 @@ Copyright (c) 2013-2018, Intel Corporation All rights reserved. - - Redistribution and use in source and binary forms, with or without + + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, + + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - - 3. Neither the name of the Intel Corporation nor the names of its - contributors may be used to endorse or promote products derived from + + 3. Neither the name of the Intel Corporation nor the names of its + contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -661,7 +661,7 @@ ixl_write_i2c_byte_reg(struct ixl_pf *pf, u8 byte_offset, reg |= (datai2c << I40E_GLGEN_I2CCMD_DATA_SHIFT); reg &= ~I40E_GLGEN_I2CCMD_OP_MASK; - /* Write command to registers controling I2C - data and address. */ + /* Write command to registers controlling I2C - data and address. */ wr32(hw, I40E_GLGEN_I2CCMD(hw->func_caps.mdio_port_num), reg); status = ixl_wait_for_i2c_completion(hw, hw->func_caps.mdio_port_num); diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 527a47338b3f..7cd793502476 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -1872,7 +1872,7 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iomode, if (nd->nd_repstat) { /* * In case the rpc gets retried, roll - * the uio fileds changed by nfsm_uiombuf() + * the uio fields changed by nfsm_uiombuf() * back. */ uiop->uio_offset -= len; @@ -6423,7 +6423,7 @@ nfsrpc_writeds(vnode_t vp, struct uio *uiop, int *iomode, int *must_commit, if (nd->nd_repstat != 0) { /* * In case the rpc gets retried, roll - * the uio fileds changed by nfsm_uiombuf() + * the uio fields changed by nfsm_uiombuf() * back. */ uiop->uio_offset -= len; diff --git a/sys/mips/ingenic/jz4780_regs.h b/sys/mips/ingenic/jz4780_regs.h index 221c21784925..c46045ae0e18 100644 --- a/sys/mips/ingenic/jz4780_regs.h +++ b/sys/mips/ingenic/jz4780_regs.h @@ -483,9 +483,9 @@ readreg(uint32_t reg) #define JZ_SMBFHCNT 0x1C /* Fast speed SMB SCL high count */ #define JZ_SMBFLCNT 0x20 /* Fast speed SMB SCL low count */ #define JZ_SMBINTST 0x2C /* SMB Interrupt Status */ - #define JZ_ISTT 0x400 /* START or RESTART occured */ - #define JZ_ISTP 0x200 /* STOP occured */ - #define JZ_TXABT 0x40 /* ABORT occured */ + #define JZ_ISTT 0x400 /* START or RESTART occurred */ + #define JZ_ISTP 0x200 /* STOP occurred */ + #define JZ_TXABT 0x40 /* ABORT occurred */ #define JZ_TXEMP 0x10 /* TX FIFO is low */ #define JZ_TXOF 0x08 /* TX FIFO is high */ #define JZ_RXFL 0x04 /* RX FIFO is at JZ_SMBRXTL*/ diff --git a/sys/net/if_pfsync.h b/sys/net/if_pfsync.h index f26a2ae34eed..ccd26c9ac0de 100644 --- a/sys/net/if_pfsync.h +++ b/sys/net/if_pfsync.h @@ -55,7 +55,7 @@ #define PFSYNC_ACT_CLR 0 /* clear all states */ #define PFSYNC_ACT_INS 1 /* insert state */ -#define PFSYNC_ACT_INS_ACK 2 /* ack of insterted state */ +#define PFSYNC_ACT_INS_ACK 2 /* ack of inserted state */ #define PFSYNC_ACT_UPD 3 /* update state */ #define PFSYNC_ACT_UPD_C 4 /* "compressed" update state */ #define PFSYNC_ACT_UPD_REQ 5 /* request "uncompressed" state */ diff --git a/sys/netinet/tcp_log_buf.h b/sys/netinet/tcp_log_buf.h index 436383124dce..bdd56c94587e 100644 --- a/sys/netinet/tcp_log_buf.h +++ b/sys/netinet/tcp_log_buf.h @@ -192,8 +192,8 @@ enum tcp_log_events { BBR_LOG_MSGSIZE, /* We received a EMSGSIZE error 19 */ BBR_LOG_BBRRTT, /* BBR RTT is updated 20 */ BBR_LOG_JUSTRET, /* We just returned out of output 21 */ - BBR_LOG_STATE, /* A BBR state change occured 22 */ - BBR_LOG_PKT_EPOCH, /* A BBR packet epoch occured 23 */ + BBR_LOG_STATE, /* A BBR state change occurred 22 */ + BBR_LOG_PKT_EPOCH, /* A BBR packet epoch occurred 23 */ BBR_LOG_PERSIST, /* BBR changed to/from a persists 24 */ TCP_LOG_FLOWEND, /* End of a flow 25 */ BBR_LOG_RTO, /* BBR's timeout includes BBR info 26 */ @@ -204,7 +204,7 @@ enum tcp_log_events { TCP_LOG_USERSEND, /* User level sends data 31 */ BBR_RSM_CLEARED, /* RSM cleared of ACK flags 32 */ BBR_LOG_STATE_TARGET, /* Log of target at state 33 */ - BBR_LOG_TIME_EPOCH, /* A timed based Epoch occured 34 */ + BBR_LOG_TIME_EPOCH, /* A timed based Epoch occurred 34 */ BBR_LOG_TO_PROCESS, /* A to was processed 35 */ BBR_LOG_BBRTSO, /* TSO update 36 */ BBR_LOG_HPTSDIAG, /* Hpts diag insert 37 */ diff --git a/sys/netinet/tcp_stacks/bbr.c b/sys/netinet/tcp_stacks/bbr.c index d57dd03ec4ec..f9535935a9db 100644 --- a/sys/netinet/tcp_stacks/bbr.c +++ b/sys/netinet/tcp_stacks/bbr.c @@ -3385,7 +3385,7 @@ bbr_get_bw_delay_prod(uint64_t rtt, uint64_t bw) { /* * Calculate the bytes in flight needed given the bw (in bytes per * second) and the specifyed rtt in useconds. We need to put out the - * returned value per RTT to match that rate. Gain will normaly + * returned value per RTT to match that rate. Gain will normally * raise it up from there. * * This should not overflow as long as the bandwidth is below 1 @@ -10667,7 +10667,7 @@ bbr_set_probebw_gains(struct tcp_bbr *bbr, uint32_t cts, uint32_t losses) } /** * We fall through and return always one of two things has - * occured. + * occurred. * 1) We are still not at target * <or> * 2) We reached the target and set rc_bbr_state_atflight @@ -11157,7 +11157,7 @@ static void bbr_state_change(struct tcp_bbr *bbr, uint32_t cts, int32_t epoch, int32_t pkt_epoch, uint32_t losses) { /* - * A tick occured in the rtt epoch do we need to do anything? + * A tick occurred in the rtt epoch do we need to do anything? */ #ifdef BBR_INVARIANTS if ((bbr->rc_bbr_state != BBR_STATE_STARTUP) && @@ -11305,7 +11305,7 @@ bbr_state_change(struct tcp_bbr *bbr, uint32_t cts, int32_t epoch, int32_t pkt_e bbr->r_ctl.rc_bbr_enters_probertt = 1; if (bbr->rc_use_google == 0) { /* - * Restore any lowering that as occured to + * Restore any lowering that as occurred to * reach here */ if (bbr->r_ctl.bbr_rttprobe_gain_val) diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c index f5b0de7cbc59..5bea540c6ab6 100644 --- a/sys/netinet/tcp_stacks/rack.c +++ b/sys/netinet/tcp_stacks/rack.c @@ -14058,7 +14058,7 @@ enobufs: } else if ((slot == 0) && (sendalot == 0) && tot_len_this_send) { /* * Get our pacing rate, if an error - * occured in sending (ENOBUF) we would + * occurred in sending (ENOBUF) we would * hit the else if with slot preset. Other * errors return. */ diff --git a/sys/netinet/tcp_stacks/tcp_rack.h b/sys/netinet/tcp_stacks/tcp_rack.h index c45b7c75cd56..04c5c4940e10 100644 --- a/sys/netinet/tcp_stacks/tcp_rack.h +++ b/sys/netinet/tcp_stacks/tcp_rack.h @@ -29,7 +29,7 @@ #define _NETINET_TCP_RACK_H_ #define RACK_ACKED 0x0001/* The remote endpoint acked this */ -#define RACK_TO_MIXED 0x0002/* A timeout occured that mixed the send order - not used */ +#define RACK_TO_MIXED 0x0002/* A timeout occurred that mixed the send order - not used */ #define RACK_DEFERRED 0x0004/* We can't use this for RTT calc - not used */ #define RACK_OVERMAX 0x0008/* We have more retran's then we can fit */ #define RACK_SACK_PASSED 0x0010/* A sack was done above this block */ diff --git a/tools/test/stress2/misc/nullfs17.sh b/tools/test/stress2/misc/nullfs17.sh index 121225f67c00..c7e447117969 100755 --- a/tools/test/stress2/misc/nullfs17.sh +++ b/tools/test/stress2/misc/nullfs17.sh @@ -29,7 +29,7 @@ # Variation of nullfs.sh # "panic: LK_RETRY set with incompatible flags (0x202400) or -# an error occured (11)" seen. +# an error occurred (11)" seen. # https://people.freebsd.org/~pho/stress/log/matt001.txt [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 diff --git a/usr.bin/ar/write.c b/usr.bin/ar/write.c index 24bac2f25b92..6ca20a372fdb 100644 --- a/usr.bin/ar/write.c +++ b/usr.bin/ar/write.c @@ -175,7 +175,7 @@ create_obj_from_file(struct bsdar *bsdar, const char *name, time_t mtime) /* * When option '-D' is specified, mtime and UID / GID from the file - * will be replaced with 0, and file mode with 644. This ensures that + * will be replaced with 0, and file mode with 644. This ensures that * checksums will match for two archives containing the exact same * files. */ @@ -645,7 +645,7 @@ write_objs(struct bsdar *bsdar) /* * Archive string table is padded by a "\n" as the normal members. * The difference is that the size of archive string table counts - * in the pad bit, while normal members' size fileds do not. + * in the pad bit, while normal members' size fields do not. */ if (bsdar->as != NULL && bsdar->as_sz % 2 != 0) bsdar->as[bsdar->as_sz++] = '\n'; diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c index be196c26977a..967de1309e9e 100644 --- a/usr.bin/fmt/fmt.c +++ b/usr.bin/fmt/fmt.c @@ -624,7 +624,7 @@ output_word(size_t indent0, size_t indent1, const wchar_t *word, size_t length, if (new_x <= goal_length) { /* * After adding the word we still aren't at the goal length, - * so clearly we add it to the buffer rather than outputing + * so clearly we add it to the buffer rather than outputting * it. */ wmemset(output_buffer + output_buffer_length, L' ', _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main To unsubscribe, send any mail to "[email protected]"
