From nobody Wed Sep 07 07:26:52 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MMv2h5NRlz4bnnK; Wed, 7 Sep 2022 07:26:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MMv2h4vjPz3kWS; Wed, 7 Sep 2022 07:26:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662535612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qtR0L7uLqsPALJE5UzFjCLt84kueNdBs9lJlxAAB6NM=; b=egiqpGz3Tzr40Onj5kwe5qIby+eK6RpxTErPxV+LecTpAt7lfqWZ4Guf3ULgbZBopc4tHB k/Z46M834Mbc8WVWnQ48O2J6VIqhpKq0NsIuZv1bCnZHYuX2K93j0xnVbJ5GGPG1pwje2O LFuPYdx0DMWOR4n/BVRcHRudiyYqXwCy3mY7+yHVTnq+52DGyxldHEt/+KNWCWABMnPcHe M1b/8rY70sixNbVvJBtRkdtHaAwk3BKDB3F7opekHnrRQCp1sYqbqVMn2/jkxsixpXQ/+5 TlczEWBaUUoKINoFm7RdlEwe/b76CnaOBwkZLsEHjXloiIuXC4Mh/F+cf3GAcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MMv2h3rdmzRxj; Wed, 7 Sep 2022 07:26:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2877Qq03042615; Wed, 7 Sep 2022 07:26:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2877QqTM042614; Wed, 7 Sep 2022 07:26:52 GMT (envelope-from git) Date: Wed, 7 Sep 2022 07:26:52 GMT Message-Id: <202209070726.2877QqTM042614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 09fbc924f942 - stable/13 - netpfil: Correct some typos in source code comments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 09fbc924f9421b714b9063d62329a5733845153b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662535612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qtR0L7uLqsPALJE5UzFjCLt84kueNdBs9lJlxAAB6NM=; b=dggsXBimbXK7c/ghwm2/CSDz7sdKThKhBV4D5qhyJDSC+7RxwTaoEtqg19bWB8Lko222Y1 5e6uDHLEQGaVROUztThMvXs0Dvwtys7fhmD6PaR+Jn/XYFBeKmJJeLWnRKJUXDpmJjijXn D0VNdVjgHM2vKhdENU+btcnR8MefdNwJaRr6me506/nXyY+OnQcH+GRsi06HctXKO+RIqP 55xuvQEASw78FXoSEeGViI06J3YQ1FIldORc6/Fs2ySLHkwGLPZH5SoqXMqwBk1Xv1IEyr 5x4SE3CfgBhrkOO+kEOT2392QBrkjueAl41G70n7xUELjmSj8qWGzRhfKqcSoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662535612; a=rsa-sha256; cv=none; b=h/4xixJ90YIntsBlQdjTzadA+J9LaCsC2Ug8uVTwxoMeb7CQN2/yPC5DE1IzCeeHahGKs4 cPm+ueugdu578rzr1UKzm19Rqh/MQ1C0Pk2fDEirRitAS/uSTpi9GgRvzEh5FfigcrWi31 gPrQlzbqMcuPQfypdI3eFYDIV70Ip85HHNvNH4+DTXIPzsRW2vuE9IUhzjWDwqNlnLmPrR soPyqu0CB/2vImFd5IiIlLGT515VfyRRTq7I+H5QBMUrLw2q/B6fYd9TBQcDRE9eTKK7ht hgN2uMQZsL+Dykw0CpAkTjx+NVk102rQPT9rYDx5zBbCCZF0RMh5cc/ADIFhNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=09fbc924f9421b714b9063d62329a5733845153b commit 09fbc924f9421b714b9063d62329a5733845153b Author: Gordon Bergling AuthorDate: 2022-09-04 10:46:05 +0000 Commit: Gordon Bergling CommitDate: 2022-09-07 07:22:12 +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 0371f816d33b..591e5f1a33cb 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 a76e8b1ac667..3b96a9ac019f 100644 --- a/sys/netpfil/ipfw/ip_fw_dynamic.c +++ b/sys/netpfil/ipfw/ip_fw_dynamic.c @@ -1851,7 +1851,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. */