Changeset 7bdcc45 in mainline for kernel/generic/src/adt

Timestamp:

2010-12-16T16:38:49Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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.

Location:

kernel/generic/src/adt

Files:

• btree.c (modified) (2 diffs)
• hash_table.c (modified) (3 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:
                 ;
         }

kernel/generic/src/adt/hash_table.c

@@ -82 +82 @@
  * @param item Item to be inserted into the hash table.
  */
-void hash_table_insert(hash_table_t *h, unative_t key[], link_t *item)
+void hash_table_insert(hash_table_t *h, sysarg_t key[], link_t *item)
 {
         size_t chain;
@@ -105 +105 @@
  * @return Matching item on success, NULL if there is no such item.
  */
-link_t *hash_table_find(hash_table_t *h, unative_t key[])
+link_t *hash_table_find(hash_table_t *h, sysarg_t key[])
 {
         link_t *cur;
@@ -138 +138 @@
  * @param keys Number of keys in the key array.
  */
-void hash_table_remove(hash_table_t *h, unative_t key[], size_t keys)
+void hash_table_remove(hash_table_t *h, sysarg_t key[], size_t keys)
 {
         size_t chain;