Changeset 2732c94 in mainline for uspace/lib/c/include/adt

Timestamp:

2012-07-21T13:37:09Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

a2348a9

Parents:

0ca7286

Message:

Replaced separate uspace hash_set implementation with uspace's hash_table.

Location:

uspace/lib/c/include/adt

Files:

• hash_set.h (deleted)
• hash_table.h (modified) (2 diffs)
• list.h (modified) (1 diff)

uspace/lib/c/include/adt/hash_table.h

@@ -91 +91 @@
 extern void hash_table_insert(hash_table_t *, link_t *);
 extern bool hash_table_insert_unique(hash_table_t *, link_t *);
-extern link_t *hash_table_find(hash_table_t *, unsigned long []);
+extern link_t *hash_table_find(const hash_table_t *, unsigned long []);
 extern size_t hash_table_remove(hash_table_t *, unsigned long [], size_t);
 extern void hash_table_remove_item(hash_table_t *, link_t *);
@@ -98 +98 @@
         void *);
 
+
 #endif
 

uspace/lib/c/include/adt/list.h

@@ -102 +102 @@
                 iterator = next_iter, next_iter = iterator->next)
 
+#ifndef member_to_inst
+#define member_to_inst(ptr_member, type, member_identif) \
+        ((type*) (((void*)(ptr_member)) - ((void*)&(((type*)0)->member_identif))))
+#endif
+
 
 #define assert_link_not_used(link) \