From: Sebastian Huber <sebastian.huber@embedded-brains.de>
To: newlib@sourceware.org
Cc: devel@rtems.org
Subject: [PATCH 1/4] sys/tree.h: Simplify loop condition
Date: Tue, 5 Oct 2021 16:16:22 +0200 [thread overview]
Message-ID: <20211005141625.31585-2-sebastian.huber@embedded-brains.de> (raw)
In-Reply-To: <20211005141625.31585-1-sebastian.huber@embedded-brains.de>
We have
#define RB_ISRED(elm, field) \
((elm) != NULL && RB_COLOR(elm, field) == 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) == 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/tree.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 = RB_ROOT(head); \
break; \
} \
- } while (!RB_ISRED(elm, field) && parent != NULL); \
+ } while (RB_COLOR(elm, field) == RB_BLACK && parent != NULL); \
RB_COLOR(elm, field) = RB_BLACK; \
}
--
2.26.2
next prev parent reply other threads:[~2021-10-05 14:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-05 14:16 [PATCH 0/4] Optimize red-black tree insert/extract Sebastian Huber
2021-10-05 14:16 ` Sebastian Huber [this message]
2021-10-05 14:16 ` [PATCH 2/4] sys/tree.h: Simplify chain of conditions Sebastian Huber
2021-10-05 14:16 ` [PATCH 3/4] sys/tree.h: Add parent rotations Sebastian Huber
[not found] ` <DM3P110MB0522B1D6E23F958DA0732F839AAF9@DM3P110MB0522.NAMP110.PROD.OUTLOOK.COM>
2021-10-05 14:56 ` Fw: " C Howland
2021-10-05 14:16 ` [PATCH 4/4] sys/tree.h: Red child with black sibling rotations Sebastian Huber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211005141625.31585-2-sebastian.huber@embedded-brains.de \
--to=sebastian.huber@embedded-brains.de \
--cc=devel@rtems.org \
--cc=newlib@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).