aboutsummaryrefslogtreecommitdiff
path: root/misc/tsearch.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-05-02 00:50:46 +0000
committerUlrich Drepper <drepper@redhat.com>2006-05-02 00:50:46 +0000
commitafbf86d209f555381ceb07c58cc4e1741dee6d11 (patch)
tree98b149e8b1339174b98c10a216c4106258b14766 /misc/tsearch.c
parent1e528c6e1bd9d6c7d952456eab826362f489dfbd (diff)
downloadglibc-afbf86d209f555381ceb07c58cc4e1741dee6d11.zip
glibc-afbf86d209f555381ceb07c58cc4e1741dee6d11.tar.gz
glibc-afbf86d209f555381ceb07c58cc4e1741dee6d11.tar.bz2
* misc/tsearch.c (__tdelete): Remove unnecessary test
[Coverity CID 75]. * sysdeps/generic/unwind-dw2.c (execute_cfa_program): Print error message for invalid DWARF data instead of crashing.
Diffstat (limited to 'misc/tsearch.c')
-rw-r--r--misc/tsearch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/tsearch.c b/misc/tsearch.c
index 5ba244b..1e94d64 100644
--- a/misc/tsearch.c
+++ b/misc/tsearch.c
@@ -447,7 +447,7 @@ __tdelete (const void *key, void **vrootp, __compar_fn_t compar)
/* Q is R's brother, P is R's parent. The subtree with root
R has one black edge less than the subtree with root Q. */
q = p->right;
- if (q != NULL && q->red)
+ if (q->red)
{
/* If Q is red, we know that P is black. We rotate P left
so that Q becomes the top node in the tree, with P below
@@ -535,7 +535,7 @@ __tdelete (const void *key, void **vrootp, __compar_fn_t compar)
{
/* Comments: see above. */
q = p->left;
- if (q != NULL && q->red)
+ if (q->red)
{
q->red = 0;
p->red = 1;