diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-04-24 08:55:46 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-04-24 08:55:46 +0000 |
| commit | d0145e03799e484f3a53d79de3b3f34162ee9d3c (patch) | |
| tree | d8c51a0952204f9015de0db3319d4c820e8646e0 /misc | |
| parent | f5ce81c94cc27035f44d37bffa7f7e08dbce7631 (diff) | |
| download | glibc-d0145e03799e484f3a53d79de3b3f34162ee9d3c.tar glibc-d0145e03799e484f3a53d79de3b3f34162ee9d3c.tar.gz glibc-d0145e03799e484f3a53d79de3b3f34162ee9d3c.tar.bz2 glibc-d0145e03799e484f3a53d79de3b3f34162ee9d3c.zip | |
Updated to fedora-glibc-20060424T0820
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/tsearch.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/misc/tsearch.c b/misc/tsearch.c index 7c3a0aaa78..5ba244b015 100644 --- a/misc/tsearch.c +++ b/misc/tsearch.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 2000, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bernd Schmidt <crux@Pool.Informatik.RWTH-Aachen.DE>, 1997. @@ -285,11 +285,12 @@ __tsearch (const void *key, void **vrootp, __compar_fn_t compar) q->key = key; /* initialize new node */ q->red = 1; q->left = q->right = NULL; + + if (nextp != rootp) + /* There may be two red edges in a row now, which we must avoid by + rotating the tree. */ + maybe_split_for_insert (nextp, rootp, parentp, r, p_r, 1); } - if (nextp != rootp) - /* There may be two red edges in a row now, which we must avoid by - rotating the tree. */ - maybe_split_for_insert (nextp, rootp, parentp, r, p_r, 1); return q; } |