|
From: <sv...@va...> - 2005-08-15 02:05:37
|
Author: njn
Date: 2005-08-15 03:05:21 +0100 (Mon, 15 Aug 2005)
New Revision: 4417
Log:
wibbles
Modified:
trunk/coregrind/m_oset.c
Modified: trunk/coregrind/m_oset.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_oset.c 2005-08-15 01:54:05 UTC (rev 4416)
+++ trunk/coregrind/m_oset.c 2005-08-15 02:05:21 UTC (rev 4417)
@@ -461,11 +461,8 @@
static AvlNode* avl_lookup(AvlTree* t, void* k)
{
Int cmpres;
- AvlNode* curr;
+ AvlNode* curr =3D t->root;
=20
- vg_assert(t);
- curr =3D t->root;
-
if (t->cmp) {
// General case
while (True) {
@@ -494,7 +491,9 @@
// Find the *element* in t matching k, or NULL if not found.
void* VG_(OSet_Lookup)(AvlTree* t, void* k)
{
- AvlNode* n =3D avl_lookup(t, k);
+ AvlNode* n;
+ vg_assert(t);
+ n =3D avl_lookup(t, k);
return ( n ? elem_of_node(n) : NULL );
}
=20
|