Changeset 0b749a3 in mainline for kernel/generic/src/adt/btree.c

Timestamp:

2010-11-22T15:39:53Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0eddb76, aae339e9

Parents:

9a1d8ab (diff), 8cd1aa5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

• kernel/generic/src/adt/btree.c (modified) (2 diffs)

kernel/generic/src/adt/btree.c

@@ -888 +888 @@
                 *leaf_node = cur;
                 
+                if (cur->keys == 0)
+                        return NULL;
+
                 /*
                  * The key can be in the leftmost subtree.
@@ -926 +929 @@
                                 return key == cur->key[i - 1] ? val : NULL;
                 }
-                descend:
+descend:
                 ;
         }