From nobody Tue Jul 8 03:04:25 2025 X-Original-To: dev-commits-src-main@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 4bbmDB2dVnz61KsR; Tue, 08 Jul 2025 03:04:26 +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 4bbmDB19FLz3CFt; Tue, 08 Jul 2025 03:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751943866; 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=eic4AsYNh4iPHwk7/gEOsZCR3/sWlJWAumU4ebVT5i4=; b=rlQtb59OXBEUn5S1X0+SjiY8avedgEeKju7gPIjOleTlE+0qbqXoxM4QO3A+z8/LJExdy3 eV3XRSFi2Q7PCcHJd+ZLaVTe3AvF5uRdxs/Jzb2YnBtGhgn5kBsjpth3pdcEevz9NEtOqn npYSaYeEY+XY0YTd4fKC8Io6emB5Dpavy2fq5A2jh6frbNgep8jgSh27h34WojBtC/W+58 SIhpCunLgtIzfgoiLLmf9fAxC9mrQfqRofVhvH8NKD/rBUcsCSE3Inwdi8SVUB03q4cqrR mqI5S9giMhfrn5eOctzmFySYCkA/oVF/tfYXxHNf5J2KRtziFjS6MWNQOEPRwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751943866; 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=eic4AsYNh4iPHwk7/gEOsZCR3/sWlJWAumU4ebVT5i4=; b=pozEA5HMRYrwF0BrplycCany6d34u7DK3/sOQsATMvY+xvlQEVUSl3fppwafygbqjEhqIa A6q/x1JzNiu4RInHGxlUVA95rAiQbAl1toRxRgrYOYoHCnwn47+0+1J5icRwLOqwaqw3Tr 6r9Jh8ZFfMdBNoQoIias5Y5UcYyRtGLfNR0XnD3/BmMlKI/4rarN93+scNFIfd0vdgL+p0 DytyTh1nwyRGfMuDLox8l5BUp8qTFba3tygVvUTQC+3Xw51i/2AfAGIjL7Ra0E/OTPGnXI AZmJAaeh1u9XXU5olRYcrGFXHvZVg/d5rJi5yO2wz0/AMqM5NDD/bT3hREweCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751943866; a=rsa-sha256; cv=none; b=GTC9jMW17Clh6tcZvDgIyxNjotD2Yzj4N82X2UmeqFja+zgFi/Ab1YtYrNiZakLXPPaLBi iGHrLYS9nY1s+meltycLtkc8lPBRUEdUEy4SVLCe5HhhJDDwOXprKOt8zJlvlir+E4Q25N mGpyD/EVN98+z3reUd5T6xUgz+BXNoCRpdBFSVvNwAIWTcZUHJx+eFVVMmx/ZlJHGwscDh ZxaEAzbYJHln9vsSSVjdqRkYurbtX8We4WlN3bPxb+Fdca6zy/qfP/LkCdVCfHfX5P4ywF KtTl1NvICyCWaJM6aXE0nKJvzu3/cAZen1HF11bjR33XZ+Fuj5LT//Um8zBdPQ== 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 4bbmDB0jsYz3nt; Tue, 08 Jul 2025 03:04:26 +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 56834QvK078467; Tue, 8 Jul 2025 03:04:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56834Pac078464; Tue, 8 Jul 2025 03:04:25 GMT (envelope-from git) Date: Tue, 8 Jul 2025 03:04:25 GMT Message-Id: <202507080304.56834Pac078464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: e4c864e55505 - main - ip_htable: fix -Wtautological-pointer-compare warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e4c864e5550544e5ff7e395309c5098d84058403 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e4c864e5550544e5ff7e395309c5098d84058403 commit e4c864e5550544e5ff7e395309c5098d84058403 Author: Siva Mahadevan AuthorDate: 2025-04-24 12:08:47 +0000 Commit: Cy Schubert CommitDate: 2025-07-08 03:02:19 +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 --- 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 e54b739df361..91b375f80db1 100644 --- a/sys/netpfil/ipfilter/netinet/ip_htable.c +++ b/sys/netpfil/ipfilter/netinet/ip_htable.c @@ -604,7 +604,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; @@ -974,7 +974,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]; @@ -982,7 +981,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; @@ -994,7 +992,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