From nobody Tue Nov 10 05:21:09 2026 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 4jNw3p25L0z6xj07 for ; Tue, 10 Nov 2026 05:21:10 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jNw3p0klvz3C5p for ; Tue, 10 Nov 2026 05:21:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794288070; 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=GvH6qqw05LdpPIsGjtsnZHaaKoofd6cXBsxOKsvqmTA=; b=ujS7WNLafBKa4eJ/jhwNbQHw5ktHD4/e5NDj5TyzIk77noTTyNW5so201K+w7Wj2ayZy1G iRCPqisvxASdcVzplfWbVEAxvzt/O+/6mueN0vZLSzmoMjWUOPQVCsbVLY5RIlPlRzySKa oLEyUZJPsTZMC/lIUoRZfXTz3vmvuxpk7e8SiFEWyXIN2Q4HRtRhG4pKvGawmCII9iM5KK 8JgZ0LrkSX97jj3VSMAmwt6f2RwRD0MQa3k3qxbZwkwPvhj5xycplODcyHyJC3CXy4ZmwK /VgqvoSBQEdHCHUwTNZeElDBaiPF26oRw7HSSP+VPTslEoJSXJhbRSrKKH/hFQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794288070; b=bWeX+qjyMjSsPFPizcjL1RkjgE7TjXXNlftxXC1JHms4ZNxieVvx8yeBXo0VxJHlQntY+4 qShgRoLxBQH4f05ulsQeRTJ0atm/9qHSgVK+8abFY5+OKrVEeGum5ebbb6p+R0Zen1dEPL o7uHOxY9gw8SzujrsdzJU2YIA+gdlea4VYYXDSboCsaDgAzFPwAEUq6Ovgs/6y4VPe+++u yzd1XvqjzrfcA+tTl0j5uwCGZBVGRsqLAz8zq9nw2l1O4j0QelYYP8KVAUQ8+tdCSDn/ys Sw6OUPztM5Yjn2ftrzee1tcM9vmsugWGQJzpnZWzeGv13taHv4Oe1Sl3L1yOdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794288070; 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=GvH6qqw05LdpPIsGjtsnZHaaKoofd6cXBsxOKsvqmTA=; b=AwOQtIsihb0E0EXiWKTnPO2EVnTZraxXXIG8OgvFDpL1GikXGZ/sSc/vd0OkHzl3ak6g96 cJa+KbTfHZ1pfjTsjenJYBG98AvSMkDqnlZAfECJAj1yxLIWdC+TGmN2XlAwk0LlLIww+R yG1pbV3bB0+bkp8KhpgZB+LnriNM8PbpXfO/hCDaWLNgUQKU9oB+tlqDhhbxh5YvBSjRYt rl+DMn6ZSW84CzgSx72NCmWbwtnpLwBHCW/pcZFvD6ZnEI/8/D8Fy+Uc5W0q+4GbN9M4sZ xGDJeyT9MUDetL71whqZ//k4hrCSUOopqIKI7dVkKhQgSu6FspAlJ/uRBgacig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jNw3n6q1Rz1CVf for ; Tue, 10 Nov 2026 05:21:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id f7f2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Nov 2026 05:21:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: a479301abb2c - main - tests/sys/capsicum: Fix -Wshadow issue with `fd_set` List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a479301abb2c7b384f574fcc641e502f70654835 Auto-Submitted: auto-generated Date: Tue, 10 Nov 2026 05:21:09 +0000 Message-Id: <6af2a9c5.f7f2.237432e@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=a479301abb2c7b384f574fcc641e502f70654835 commit a479301abb2c7b384f574fcc641e502f70654835 Author: Enji Cooper AuthorDate: 2026-11-10 05:17:26 +0000 Commit: Enji Cooper CommitDate: 2026-11-10 05:17:26 +0000 tests/sys/capsicum: Fix -Wshadow issue with `fd_set` `fd_set` is defined in `sys/select.h`, and prior to this change, was in fcntl.cc as well. This change renames `fd_set` to `fd_set_` to avoid the name collision. MFC after: 1 week Reported by: gcc 14 Fixes: 04c4b2084eb9 ("capsicum-test: make the code WARNS=6 clean") --- tests/sys/capsicum/fcntl.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/sys/capsicum/fcntl.cc b/tests/sys/capsicum/fcntl.cc index 1ae33c2e051e..a9349b153cdc 100644 --- a/tests/sys/capsicum/fcntl.cc +++ b/tests/sys/capsicum/fcntl.cc @@ -332,17 +332,17 @@ TEST(Fcntl, FLSubRights) { // Check operations that need CAP_FCNTL with specific subrights. int fd_get = dup(fd); - int fd_set = dup(fd); + int fd_set_ = dup(fd); EXPECT_OK(cap_fcntls_limit(fd_get, CAP_FCNTL_GETFL)); - EXPECT_OK(cap_fcntls_limit(fd_set, CAP_FCNTL_SETFL)); + EXPECT_OK(cap_fcntls_limit(fd_set_, CAP_FCNTL_SETFL)); fd_flag = fcntl(fd_get, F_GETFL, 0); EXPECT_OK(fd_flag); - EXPECT_NOTCAPABLE(fcntl(fd_set, F_GETFL, 0)); - EXPECT_OK(fcntl(fd_set, F_SETFL, fd_flag)); + EXPECT_NOTCAPABLE(fcntl(fd_set_, F_GETFL, 0)); + EXPECT_OK(fcntl(fd_set_, F_SETFL, fd_flag)); EXPECT_NOTCAPABLE(fcntl(fd_get, F_SETFL, fd_flag)); close(fd_get); - close(fd_set); + close(fd_set_); // Check operations that need CAP_FCNTL with no subrights => ENOTCAPABLE. EXPECT_OK(cap_fcntls_limit(fd, 0));