Changeset 04803bf in mainline for kernel/generic/include/adt/hash_table.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• kernel/generic/include/adt/hash_table.h (modified) (4 diffs)

kernel/generic/include/adt/hash_table.h

@@ -37 +37 @@
 
 #include <adt/list.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Set of operations for hash table. */
@@ -48 +48 @@
          * @return Index into hash table.
          */
-        size_t (* hash)(unative_t key[]);
+        size_t (* hash)(sysarg_t key[]);
         
         /** Hash table item comparison function.
@@ -57 +57 @@
          * @return true if the keys match, false otherwise.
          */
-        bool (*compare)(unative_t key[], size_t keys, link_t *item);
+        bool (*compare)(sysarg_t key[], size_t keys, link_t *item);
 
         /** Hash table item removal callback.
@@ -79 +79 @@
 extern void hash_table_create(hash_table_t *h, size_t m, size_t max_keys,
     hash_table_operations_t *op);
-extern void hash_table_insert(hash_table_t *h, unative_t key[], link_t *item);
-extern link_t *hash_table_find(hash_table_t *h, unative_t key[]);
-extern void hash_table_remove(hash_table_t *h, unative_t key[], size_t keys);
+extern void hash_table_insert(hash_table_t *h, sysarg_t key[], link_t *item);
+extern link_t *hash_table_find(hash_table_t *h, sysarg_t key[]);
+extern void hash_table_remove(hash_table_t *h, sysarg_t key[], size_t keys);
 
 #endif