From nobody Mon Aug 22 09:22:21 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 4MB6ML3srKz4Z6R8; Mon, 22 Aug 2022 09:22:22 +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 4MB6ML1QjKz3hDb; Mon, 22 Aug 2022 09:22:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661160142; 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=ZECogVihf5GN5Qg9r3AttHYPZbauhhzkjcqgFmPYlf8=; b=jyP0Ip/iSSq4aUJVmcvxzhw8mhZDuRrWml5wQWDR/LtpmlVOoOlpjiJZFhga4waFE4R5bx 6xFEm7MqvlpeRkytsPWaLKxxRZSPFOVd0acJSby4zEDnOb5jnzvoAlvIwY7WeGPKGdjtE4 Y4tlMK2OTMVq53IvByJYb9QnFGYHAWpWHXlHVmYUa81uWsVmXMvJxx6P3kOSMNmHPVRpxm GeD+C+tppUKIQASzRz2hVAquXLQ/sB7Dmu/GEGXQZFu75DlbFxe0yGApjyhlhrj7OP0TQt u1Hnf3ri4hcK5Y03UPDu5j/EAQxlBfER9uQRo04hSLWNR5s9LvahOKx86NQ20A== 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 4MB6ML0TWVzlBj; Mon, 22 Aug 2022 09:22:22 +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 27M9MLZr061497; Mon, 22 Aug 2022 09:22:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27M9MLcs061496; Mon, 22 Aug 2022 09:22:21 GMT (envelope-from git) Date: Mon, 22 Aug 2022 09:22:21 GMT Message-Id: <202208220922.27M9MLcs061496@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 55fa60782f3e - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 55fa60782f3e0f63ea572e80b269acf6ad3dc8e3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661160142; 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=ZECogVihf5GN5Qg9r3AttHYPZbauhhzkjcqgFmPYlf8=; b=LjWR7G8wuPpUKFNf7V4SniJMUSA8NPzFeUQWKE0sszU3OpDDWrrcB50tnFfI8r7P5Uq2dh llFXAcWm890RWd5NYr/EQ9q49OP0XCqtSMhkyN1OjctLyFiQ7Frrc4vKtzJ5mr+N4uVsVy DbVFE55sj8sYZ8jH1er/5EsSonqY4vP3rihombT6AfV6o/VMPH9XKU6exIhe3Utl0wG/S5 eVJT1UrabzszG8CDxZjLIrFYc5ikqacQ1z/M1NOAj512xE3qShanGGbs8w++t1eMdU0sTC rgEDDitEeZFOMdX/70ITKTf7kHWXJdhoC/ykWUa+XlDhn7AlEapjRwMKB5Xl/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661160142; a=rsa-sha256; cv=none; b=k4Hs86xHcBn2RnLkaUnnKuD+7PQVrKkSkdE1MGr/Fel0ZUNdu0Z99yTIPB7q/Wibg/dspm HlidaVqLMRCJ6/GSS4SyAd0kzoua/FL7XlGiYMwjuFaZITz16tsdZPBvuEDPpzBScEOtt0 oQYoNq3eXIL4etIgib9QJRb8tRew6y/C/6uQzqbDOJsE4iv2enPf611TOWgMZJwePepEr2 IU/dKIGVq2p5Q01fEkumtKDVv+KSn3GQ+wMd4yCxCm/B5kGK9KYGqGUOvSE7Am4ngDkw/p FWgsc0nr6Egh7uQUPyc0W1lBuPV4S6zRl19uDuAiZHPBMfHK0GQc+DZpEUK0JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=55fa60782f3e0f63ea572e80b269acf6ad3dc8e3 commit 55fa60782f3e0f63ea572e80b269acf6ad3dc8e3 Author: Doug Moore AuthorDate: 2022-08-02 16:47:17 +0000 Commit: Doug Moore CommitDate: 2022-08-22 09:22:04 +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 (cherry picked from commit b3fd5464a903180994313bd903f3c170f5f9e1f3) --- 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 b66fa88829b2..2baadf768340 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 { \