From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dedi548.your-server.de (dedi548.your-server.de [85.10.215.148]) by sourceware.org (Postfix) with ESMTPS id 217763857C50 for ; Tue, 5 Oct 2021 15:33:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 217763857C50 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embedded-brains.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embedded-brains.de Received: from sslproxy03.your-server.de ([88.198.220.132]) by dedi548.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92.3) (envelope-from ) id 1mXmRx-000Djs-6k; Tue, 05 Oct 2021 17:33:49 +0200 Received: from [82.100.198.138] (helo=mail.embedded-brains.de) by sslproxy03.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mXmRx-000MRc-3z; Tue, 05 Oct 2021 17:33:49 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id B9469480077; Tue, 5 Oct 2021 17:33:48 +0200 (CEST) Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id ANabpd_A4xDU; Tue, 5 Oct 2021 17:33:48 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.embedded-brains.de (Postfix) with ESMTP id 79B924800EF; Tue, 5 Oct 2021 17:33:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at zimbra.eb.localhost Received: from mail.embedded-brains.de ([127.0.0.1]) by localhost (zimbra.eb.localhost [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 3xBwDc4wm2iA; Tue, 5 Oct 2021 17:33:48 +0200 (CEST) Received: from zimbra.eb.localhost (unknown [192.168.96.242]) by mail.embedded-brains.de (Postfix) with ESMTPSA id 5F5B74800ED; Tue, 5 Oct 2021 17:33:48 +0200 (CEST) From: Sebastian Huber To: newlib@sourceware.org Cc: devel@rtems.org Subject: [PATCH v2 1/4] sys/tree.h: Simplify loop condition Date: Tue, 5 Oct 2021 17:33:41 +0200 Message-Id: <20211005153344.91266-3-sebastian.huber@embedded-brains.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211005153344.91266-1-sebastian.huber@embedded-brains.de> References: <20211005153344.91266-1-sebastian.huber@embedded-brains.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Authenticated-Sender: smtp-embedded@poldinet.de X-Virus-Scanned: Clear (ClamAV 0.103.3/26313/Tue Oct 5 11:04:18 2021) X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Oct 2021 15:33:52 -0000 We have #define RB_ISRED(elm, field) \ ((elm) !=3D NULL && RB_COLOR(elm, field) =3D=3D RB_RED) So, the RB_ISRED() contains an implicit check for NULL. In RB_GENERATE_REMOVE_COLOR() the "elm" pointer cannot be NULL in the while condition. Use RB_COLOR(elm) =3D=3D RB_BLACK instead. --- newlib/libc/include/sys/tree.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/newlib/libc/include/sys/tree.h b/newlib/libc/include/sys/tre= e.h index 2af77a499..15831c7dd 100644 --- a/newlib/libc/include/sys/tree.h +++ b/newlib/libc/include/sys/tree.h @@ -540,7 +540,7 @@ name##_RB_REMOVE_COLOR(struct name *head, struct type= *parent) \ elm =3D RB_ROOT(head); \ break; \ } \ - } while (!RB_ISRED(elm, field) && parent !=3D NULL); \ + } while (RB_COLOR(elm, field) =3D=3D RB_BLACK && parent !=3D NULL); \ RB_COLOR(elm, field) =3D RB_BLACK; \ } =20 --=20 2.26.2