Changeset 98000fb in mainline for kernel/generic/include/adt/hash_table.h

Timestamp:

2009-06-03T19:34:45Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

301ff30

Parents:

69e68e3

Message:

remove redundant index_t and count_t types (which were always quite ambiguous and not actually needed)

File:

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

kernel/generic/include/adt/hash_table.h

@@ -48 +48 @@
          * @return Index into hash table.
          */
-        index_t (* hash)(unative_t key[]);
+        size_t (* hash)(unative_t key[]);
         
         /** Hash table item comparison function.
@@ -57 +57 @@
          * @return true if the keys match, false otherwise.
          */
-        bool (*compare)(unative_t key[], count_t keys, link_t *item);
+        bool (*compare)(unative_t key[], size_t keys, link_t *item);
 
         /** Hash table item removal callback.
@@ -69 +69 @@
 typedef struct {
         link_t *entry;
-        count_t entries;
-        count_t max_keys;
+        size_t entries;
+        size_t max_keys;
         hash_table_operations_t *op;
 } hash_table_t;
@@ -77 +77 @@
         list_get_instance((item), type, member)
 
-extern void hash_table_create(hash_table_t *h, count_t m, count_t max_keys,
+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[], count_t keys);
+extern void hash_table_remove(hash_table_t *h, unative_t key[], size_t keys);
 
 #endif