From nobody Sun Aug 10 05:24:52 2025 X-Original-To: dev-commits-src-branches@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 4c05n13XZFz63pCp; Sun, 10 Aug 2025 05:24:53 +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 4c05n10jmtz3Jbg; Sun, 10 Aug 2025 05:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754803493; 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=tiDcxqiZNfnEDUgrXPHXRjRLzTYJ4bG2JtOXQu5oZ6I=; b=nlvgSDNn2pxPfiqBA4zEKNTrksLNqc7hXeeTI++0ZjVf/qslkL0mtpm2u4HPx3ZBM5teCx FZGCRaqPdGmiX3ZijB4lzHsv1PuCAWcnA5PY94X0xuXbu1R8riOsDqjdjRBHfNJxMFdVG2 x9whNgMqYvTijDKZASnW7sMublbsivDYCzz4EmfuY08R9pcQGsodiZ3oj1zXM9UogPPBvA xN9VRVqHuo0I2PfsZ3k1Ixi1TUN3suRsmth/3knvApv1/4QsJqB509xnSQ7DiWNSmK4oMG syVgYWd0CsSNY2D4m5mX4eI/PxL/iWRCw2/sXjgEaIgJNIu4P9JIfVUl26jqCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754803493; 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=tiDcxqiZNfnEDUgrXPHXRjRLzTYJ4bG2JtOXQu5oZ6I=; b=rzSvw2R3jHD2FFPwQJCLzAJ49YL/FytZTZMrJwZ8acrZqTPo71FhpYg5bTu6SKLmo74qGQ JiDjh4wGXWe3A615YHVCuk2QuyqXv8RHh/kjjxu//ZLT2hT9wPl/1Dcz56q41tK8IDhpRC H34YDhdBDwglwby5EVhcKka08B3DWlZNuHKRosIO248MiiINXdL/ogPmEiUZ8aOZL01Z47 Shpr6d9H6giOHCm5R+GkloJcnbLfJmLHTlq6fz/g2F32s+R3/kFOa1SPY5z5sdsrYdAaxo gMOgx0AZpzhGqNjQ+drFxGmbKDWGrqWFI310vw3m+WufoL6FO5J+3v3sbDuYog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754803493; a=rsa-sha256; cv=none; b=dUp4pOYjACAwCoW/8c4TqvnMHNp74su5+a+0HAj9LCqtGeHkTewnIL2Lub1Hkd5DVnFNSs HOduaLngyVcZnAW4WVNSD9YyRt62XB5gwVTYR2tYGjREipsp12IpQ4yg0y97xohdfY8kcB 78u0LjQWQc90SPZ1Gig8Zy3I+Ndlv7dMwSEhQjrxPrxc8/Fu1LFe37AfG1fer64ueYiyJ9 B6ROMgHFVUpnXRsUQt9e1n50KRKQs1m1j32j2VWelNG62PfzQr4K7W4S4T/LVHZ1bR3cJJ dcnvj3ub16/PZfoPwSV9S9R7c+ecvJyFFYXx/pYUWBwn06iSUFie/xqR9ihwAw== 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 4c05n10JBjzt0d; Sun, 10 Aug 2025 05:24:53 +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 57A5OqqN020766; Sun, 10 Aug 2025 05:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57A5Oq8N020763; Sun, 10 Aug 2025 05:24:52 GMT (envelope-from git) Date: Sun, 10 Aug 2025 05:24:52 GMT Message-Id: <202508100524.57A5Oq8N020763@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: 3922d7f62778 - stable/14 - ip_htable: fix -Wtautological-pointer-compare warnings List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 3922d7f6277847dd0d0337a802fa4437e8d2ff60 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=3922d7f6277847dd0d0337a802fa4437e8d2ff60 commit 3922d7f6277847dd0d0337a802fa4437e8d2ff60 Author: Siva Mahadevan AuthorDate: 2025-04-24 12:08:47 +0000 Commit: Cy Schubert CommitDate: 2025-08-10 05:23:59 +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 d405df99558e..1907aa0f9f5f 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -606,7 +606,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; @@ -976,7 +976,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]; @@ -984,7 +983,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; @@ -996,7 +994,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