git: 58a6a1318d1f - stable/12 - netpfil: Correct some typos in source code comments
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 07 Sep 2022 07:49:32 UTC
The branch stable/12 has been updated by gbe (doc committer):
URL: https://cgit.FreeBSD.org/src/commit/?id=58a6a1318d1f7c973c2d8ce4b2e8ad7bb7ef78a5
commit 58a6a1318d1f7c973c2d8ce4b2e8ad7bb7ef78a5
Author: Gordon Bergling <gbe@FreeBSD.org>
AuthorDate: 2022-09-04 10:46:05 +0000
Commit: Gordon Bergling <gbe@FreeBSD.org>
CommitDate: 2022-09-07 07:48:46 +0000
netpfil: Correct some typos in source code comments
- s/occured/occurred/
- s/the the/the/
(cherry picked from commit 4d89e2018cbc7b70abdc1a78ea01a7c423a96347)
---
sys/netpfil/ipfilter/netinet/fil.c | 2 +-
sys/netpfil/ipfilter/netinet/ip_fil.h | 2 +-
sys/netpfil/ipfilter/netinet/ip_state.c | 2 +-
sys/netpfil/ipfw/ip_fw_dynamic.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/netpfil/ipfilter/netinet/fil.c b/sys/netpfil/ipfilter/netinet/fil.c
index 289155661b8c..322de20413c4 100644
--- a/sys/netpfil/ipfilter/netinet/fil.c
+++ b/sys/netpfil/ipfilter/netinet/fil.c
@@ -7360,7 +7360,7 @@ ipf_token_expire(ipf_main_softc_t *softc)
/* Loop through all of the existing tokens and call deref to see if they */
/* can be freed. Normally a function like this might just loop on */
/* ipf_token_head but there is a chance that a token might have a ref count */
-/* of greater than one and in that case the the reference would drop twice */
+/* of greater than one and in that case the reference would drop twice */
/* by code that is only entitled to drop it once. */
/* ------------------------------------------------------------------------ */
static void
diff --git a/sys/netpfil/ipfilter/netinet/ip_fil.h b/sys/netpfil/ipfilter/netinet/ip_fil.h
index bf553faf2abe..85a79eda1172 100644
--- a/sys/netpfil/ipfilter/netinet/ip_fil.h
+++ b/sys/netpfil/ipfilter/netinet/ip_fil.h
@@ -833,7 +833,7 @@ typedef struct frentry {
#define FR_STATESYNC 0x1000000 /* synchronize state to slave */
#define FR_COPIED 0x2000000 /* copied from user space */
#define FR_INACTIVE 0x4000000 /* only used when flush'ing rules */
-#define FR_NOMATCH 0x8000000 /* no match occured */
+#define FR_NOMATCH 0x8000000 /* no match occurred */
/* 0x10000000 FF_LOGPASS */
/* 0x20000000 FF_LOGBLOCK */
/* 0x40000000 FF_LOGNOMATCH */
diff --git a/sys/netpfil/ipfilter/netinet/ip_state.c b/sys/netpfil/ipfilter/netinet/ip_state.c
index ecee192e5571..cc0e8559fb16 100644
--- a/sys/netpfil/ipfilter/netinet/ip_state.c
+++ b/sys/netpfil/ipfilter/netinet/ip_state.c
@@ -1904,7 +1904,7 @@ ipf_tcpoptions(ipf_state_softc_t *softs, fr_info_t *fin, tcphdr_t *tcp,
/*
* Extract the TCP options we are interested in out of
- * the header and store them in the the tcpdata struct.
+ * the header and store them in the tcpdata struct.
*/
switch (opt)
{
diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c
index 8321df175f9d..7f550d00cf2e 100644
--- a/sys/netpfil/ipfw/ip_fw_dynamic.c
+++ b/sys/netpfil/ipfw/ip_fw_dynamic.c
@@ -1854,7 +1854,7 @@ dyn_get_parent_state(const struct ipfw_flow_id *pkt, uint32_t zoneid,
/*
* We must exit from critical section because the following code
* can acquire bucket mutex.
- * We rely on the the 'count' field. The state will not expire
+ * We rely on the 'count' field. The state will not expire
* until it has some child states, i.e. 'count' field is not zero.
* Return state pointer, it will be used by child states as parent.
*/