From nobody Sun Aug 10 05:55:40 2025 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 4c06SY37pgz63slq; Sun, 10 Aug 2025 05:55:41 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c06SY0Hqmz3PsN; Sun, 10 Aug 2025 05:55:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754805341; 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=lOIxZCDyCobS6ibL103LfbLOT5nv4ae4N58s1PEuJmo=; b=AwX3+0pz/3Y2an2YWWuu8AntwJRCCF2KOt68/Q6wtufnoy8s4n2cklEaMD2waTEKEw+q2D vLQLvydruYUAM6AKUMIsPgCNgBV/3PLCCw68VB2aJMkK4/WFDnIdmkaEA7IuYnKPHxKTFe JzLYl5hHHAjhTC9xSUY2iiYmVSElnJxx/linRgSJjcjfb2GZZjwzCgIEbbCok8Ylaf/0kc 5JaPLyx19U/ozR5Q3M75dpdIL5wX86ieYMipW55UK9D15yguY0I8aEq3D6sCLm4rTUHG9E z6CVr7vZzeE5BodImtErV2DMuxmXmFb2ZLapttOnKwZ8Ww5hVHlU/c29tCtORw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754805341; 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=lOIxZCDyCobS6ibL103LfbLOT5nv4ae4N58s1PEuJmo=; b=Gcl87hqNKU8qfAuRRByjLaEC0UnFXvMoR5z1Y5PuBrq1aapqJhAghqvjg3fkeFHNor8cp7 b4D0h6uIhMwaDKlc5nbEsYBl/y+rwLn/b8JwrFx5Hjzw/9i5RJpSEh1B8tWvUt8STIzPeH A4U3NT/XE2o6aveoicBdcXL39RuIkx1PgeOE68PSiVKpTdo8Q0nRiEgVN0Xo0S+UglVYRw EkeNxhF0Rm13pUmNzxEahKDOlecZ0uQ2djy7vmBAme7Y2TMH1kNxpFxy/3XM60SaboG+5h 3PAZCH46TRd3f50S2J9JN8KA5r32k/YsxZkifErONLiObBmHama7oH3TnqtkqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754805341; a=rsa-sha256; cv=none; b=WGhUSo3f54dwBT92YkdjRJT3/74gZXyQttRXz8473lL6MYOCqziifLTiuICHJbFHeEFXFF ltXHjOxLsbJKgCJrkJoIse5M+alY4biOQW6HQ8WD2U77zCHjD3FlmwYmBvjO8thwkO3d+N Oi8U2GPFi5RojFDmpxyAxabFCrBy210XnUUlikeDgpS6QYDIwyOhpH9RcNGaCeN558H8Hx axk2FOj8VhefZmG0h+mfoBeJFrlHuzf8f8nDGgrKVKjkKYiWSRiKo96Qig/ABZSN4wG/vk qSdxRu6+O6QXqXqTCTieWIPiGD/zVJknS+xWiLIHw/NBwkpwxlnBz90AnbDOUQ== 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 4c06SX70P0zv3K; Sun, 10 Aug 2025 05:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57A5tejZ077794; Sun, 10 Aug 2025 05:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57A5tedr077790; Sun, 10 Aug 2025 05:55:40 GMT (envelope-from git) Date: Sun, 10 Aug 2025 05:55:40 GMT Message-Id: <202508100555.57A5tedr077790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 8bbb1f4ce7a2 - stable/13 - ip_htable: fix -Wtautological-pointer-compare warnings 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8bbb1f4ce7a28236bcdce072c2113c43a2a7acd0 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=8bbb1f4ce7a28236bcdce072c2113c43a2a7acd0 commit 8bbb1f4ce7a28236bcdce072c2113c43a2a7acd0 Author: Siva Mahadevan AuthorDate: 2025-04-24 12:08:47 +0000 Commit: Cy Schubert CommitDate: 2025-08-10 05:55:15 +0000 ip_htable: fix -Wtautological-pointer-compare warnings This also fixes a few other trivial -Wunused-but-set-variable warnings. Pull Request: https://github.com/freebsd/freebsd-src/pull/1677 MFC after: 1 month (cherry picked from commit e4c864e5550544e5ff7e395309c5098d84058403) --- sys/netpfil/ipfilter/netinet/ip_htable.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_htable.c b/sys/netpfil/ipfilter/netinet/ip_htable.c index 1119deb031a4..b47a1aa2d795 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -608,7 +608,7 @@ ipf_htent_remove(ipf_main_softc_t *softc, void *arg, iphtable_t *iph, switch (iph->iph_type & ~IPHASH_ANON) { case IPHASH_GROUPMAP : - if (ipe->ipe_group != NULL) + if (ipe->ipe_ptr != NULL) ipf_group_del(softc, ipe->ipe_ptr, NULL); break; @@ -978,7 +978,6 @@ ipf_htent_find(iphtable_t *iph, iphtent_t *ipeo) { iphtent_t ipe, *ent; u_int hv; - int bits; bcopy((char *)ipeo, (char *)&ipe, sizeof(ipe)); ipe.ipe_addr.i6[0] &= ipe.ipe_mask.i6[0]; @@ -986,7 +985,6 @@ ipf_htent_find(iphtable_t *iph, iphtent_t *ipeo) ipe.ipe_addr.i6[2] &= ipe.ipe_mask.i6[2]; ipe.ipe_addr.i6[3] &= ipe.ipe_mask.i6[3]; if (ipe.ipe_family == AF_INET) { - bits = count4bits(ipe.ipe_mask.in4_addr); ipe.ipe_addr.i6[1] = 0; ipe.ipe_addr.i6[2] = 0; ipe.ipe_addr.i6[3] = 0; @@ -998,7 +996,6 @@ ipf_htent_find(iphtable_t *iph, iphtent_t *ipeo) } else #ifdef USE_INET6 if (ipe.ipe_family == AF_INET6) { - bits = count6bits(ipe.ipe_mask.i6); hv = IPE_V6_HASH_FN(ipe.ipe_addr.i6, ipe.ipe_mask.i6, iph->iph_size); } else