Changeset 8fb1bf82 in mainline for kernel/generic/src/adt/btree.c

Timestamp:

2010-11-25T13:42:50Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8df8415

Parents:

a93d79a (diff), eb667613 (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 mainline 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:
                 ;
         }