From nobody Tue Aug 02 17:39:13 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 4Ly2Ky3DzLz4XlRm; Tue, 2 Aug 2022 17:39:18 +0000 (UTC) (envelope-from rpokala@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ly2Ky2jY1z3w26; Tue, 2 Aug 2022 17:39:18 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659461958; 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: in-reply-to:in-reply-to:references:references; bh=SxtokNJymkx0HrvHOTIqWELULNs1EaZL/Roh2Hg+vhk=; b=Ip91TIxlmWph/gtsk4Tq2EBxpfdLSQC749XADCkBcvNgJz6mJRGvT6OsOjO8MZVpd0f9K6 OyMWlNShAL+Xfc1sJWw4aCOLP4DrFzRRoCyzU7iUK+hgEsutOVv3kB0Ws8KotrjLLnrPoV RJf2sB4s76ZUZKMGgsXoZLOxyuouoPFE4pOFHIUwU3B2jBMoX37Cp5m/WbxUYzy/l82w3B CUlDkKKYM+Zj4vyYIeKm+SF9PNULet/B44/KUhoRlXK4uKPRU7Lj1A0+u9LNoHikchJRep VUi80qpyeNTg6Rp8jRTojC64qbL3ZtBf/ArpLTQeD2Oovr7737QIuX9XfHgzJg== Received: from [192.168.1.10] (unknown [98.42.164.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Ly2Kx50ldzVnp; Tue, 2 Aug 2022 17:39:17 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.63.22070801 Date: Tue, 02 Aug 2022 10:39:13 -0700 Subject: Re: b3fd5464a903 - main - rb_tree: resolve name clash From: Ravi Pokala To: Doug Moore , , , Message-ID: Thread-Topic: b3fd5464a903 - main - rb_tree: resolve name clash References: <202208021649.272Gnw5J079295@gitrepo.freebsd.org> In-Reply-To: <202208021649.272Gnw5J079295@gitrepo.freebsd.org> 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: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659461958; 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: in-reply-to:in-reply-to:references:references; bh=SxtokNJymkx0HrvHOTIqWELULNs1EaZL/Roh2Hg+vhk=; b=Aj59ResTSKhjtyU+ZoTsLGshXGTZN50K7nRK826V/9kZ9JyGnZqeM9DQq1fNslHjbcmUhQ ofc05iZVVEsN3XZ3uk1Uo/gdCvqpfu6Vlw7EId8VfLkf+6pKYGrucpiNGl1hDzq1M/H1dd S+TRRQijxpNqI0KR7v41RtaVmf30VVvzi2wZc/IvHf4pqNJGlOrzGAqjAA2RqWoBPc8U9F tbz9obmQk29IOGsdm7pHXFYG6NbgUz8/Nx4+K1+UfROrXVyQZdJZmglXGjHif5PVb1T231 5fNMu/dYbDhpy1aE2b+2GRXIVtxYVGeSOgMaZSgr5+TqqMVpGoX1G9Uo8d7rHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659461958; a=rsa-sha256; cv=none; b=ju9g1S1vLPgYoUSPipPCJ4Kg+ZtC619/MbRXW+lpLqClx2vYcnpcPAbKUmilT6H1I5QHbg QPn3WVSUxsuB+2fcnVHwspqsXMKems9XabOdMKNtyqne4Y0N18hhiWelQsZ4N3K/aWpmqk QUi+Vaf4FxGcpCAM2at/5RoFm/6Tkse14LHPEqw5CvA1PGlBqTeF8vzj91N+NpLWGUHwvo 2ovt9bkdxCXkN8S3QmCaddeRFTs07zlA21D8awtjfb6S/j1DnUNb8p6WmQt0yFfJTONBy9 DwuaBPN4s8MBFtvF1dconkw7PWxR8o1EOf5jbBBE8WAeAVNjLQHzaPMZwk59Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N -----Original Message----- From: on behalf of Doug Moore Date: 2022-08-02, Tuesday at 09:49 To: , , Subject: git: b3fd5464a903 - main - rb_tree: resolve name clash 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. I was going to suggest '_tmp', because macro-local variables are supposed to have leading underscores, right? Thanks, Ravi (rpokala@) 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 { \