From nobody Tue Aug 02 16:49:58 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 4Ly1F23PGZz4XcPr; Tue, 2 Aug 2022 16:49:58 +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 4Ly1F22tkBz3rPl; Tue, 2 Aug 2022 16:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659458998; 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=cfZ60SBMNtMmH1ogSjW7PbkKD7gdZjUUDtmwF9bp6gk=; b=tjbJhVWHktuC1TCCiOJ3Ienf4htnhegiSPMJPkgTfMBIrV/n6DLDUHXvnkR6UZPVyOgr0O SWSyapNU4PCfUc3NL7HV2XW/7qcgWAadxgKAsqcvCBNa46T2Ll+Z+ARnwCQTaRsBhd3oTS 2+MGEylKJCKRC047FpImQq1sRScChtS9ElYUVltQe6TbiDOkZHIBgUHhLOJ0yxKO/uX6iL KrfpTKmtJ12lfxZlCA1FbN9+gTsNYxHRqMSOPwiYx/RcZ9/LB8IBgLwVAj0CXotBna0Stg supJfL5xArF8HVYNAC1jCQ9KPRM9oB9Io/Z1EtU0RFYbQedWBaqBjMhyNsXmJQ== 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 4Ly1F21x6pzKTB; Tue, 2 Aug 2022 16:49:58 +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 272Gnwa6079296; Tue, 2 Aug 2022 16:49:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 272Gnw5J079295; Tue, 2 Aug 2022 16:49:58 GMT (envelope-from git) Date: Tue, 2 Aug 2022 16:49:58 GMT Message-Id: <202208021649.272Gnw5J079295@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: b3fd5464a903 - main - rb_tree: resolve name clash 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3fd5464a903180994313bd903f3c170f5f9e1f3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659458998; 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=cfZ60SBMNtMmH1ogSjW7PbkKD7gdZjUUDtmwF9bp6gk=; b=mbhSweQNrp6f5DR2lEsN7CoMCRluh6lanS63J1Xi0eSkHXE4az5HKuWm3QQvMdZJ11yynY 8pT+lAaQ2wcGheZaKk2xx/L93i/TBcwoeDxFPngfKnNXtYrZz+xrDON+zY8XjCGL4HjbNf YDZdshMSAQupA9GMhIvjjNJlte2Ln7c+hBVgdb0gykbMB6TUjXoKAmyGzKDSKuML5jlS+c YUKYhd+t3fOIxdDK5JMYVwpzHtivnXJHXnNDLLbJd3YrKHzqHaiOD15ZaOzNhF7i8lTwqt 3acr9uuvwgKU8Il7bYgPlEe/OUd2KvXwfuLF1CktakOmpfyhbCIz7zm9tCODow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659458998; a=rsa-sha256; cv=none; b=ijWoqExxZiQPut41XjowB4XSdT8RmDOHkyjX5zfwnHctGi+jgkkpRAtWUlyc9hPNCL/qEx ld4aGGrFsIxeq8p5tOw6ceR0lP+O58Yskf+qq0rm8SSgbcAGiIM3oTzoorHP+2Qbs55VWB 6vHgqY1Tpkl0KQMA482ydivIxe/0crH93Pt4CQu1sgdN78dxs5zFpJFNaOLedKbGSAQ//C qTmuGkvMjiEjlHdkjIeX22+vkChX7h4bC4j+UVwWMn+dU3zaGjRgz+KRNTzk10iATreyPj 0RLiamVNsnft9C2T6zC5gwjs0MQGshTtjNEbc955IRu6z2r4mjr2UM4x78gCiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=b3fd5464a903180994313bd903f3c170f5f9e1f3 commit b3fd5464a903180994313bd903f3c170f5f9e1f3 Author: Doug Moore AuthorDate: 2022-08-02 16:47:17 +0000 Commit: Doug Moore CommitDate: 2022-08-02 16:47:17 +0000 rb_tree: resolve name clash Rename 'tmp' to 'rb_update_tmp' in a macro to avoid a shadow variable panic. Reported by: imb@protected-networks.net Fixes: 35557a0d9169 --- sys/sys/tree.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/sys/tree.h b/sys/sys/tree.h index c0d21b5f8b73..45791e08c947 100644 --- a/sys/sys/tree.h +++ b/sys/sys/tree.h @@ -372,10 +372,10 @@ struct { \ #endif #define RB_UPDATE_AUGMENT(elm, field) do { \ - __typeof(elm) tmp = (elm); \ + __typeof(elm) rb_update_tmp = (elm); \ do { \ - RB_AUGMENT(tmp); \ - } while ((tmp = RB_PARENT(tmp, field)) != NULL); \ + RB_AUGMENT(rb_update_tmp); \ + } while ((rb_update_tmp = RB_PARENT(rb_update_tmp, field)) != NULL); \ } while (0) #define RB_SWAP_CHILD(head, out, in, field) do { \