Changes in common/include/adt/hash_table.h [45226285:ad9178bf] in mainline

File:

• common/include/adt/hash_table.h (modified) (3 diffs)

common/include/adt/hash_table.h

@@ -60 +60 @@
 
         /** Returns true if the key is equal to the item's lookup key. */
-        bool (*key_equal)(const void *key, size_t hash, const ht_link_t *item);
+        bool (*key_equal)(const void *key, const ht_link_t *item);
 
         /** Hash table item removal callback.
@@ -85 +85 @@
         member_to_inst((item), type, member)
 
-/** Iterate over all entries associated with a given key.
- * For iterating over all entries regardless of key, use hash_table_apply().
- *
- * Example:
- * struct ht_entry {
- *     ht_link_t my_link_member;
- *     void *data;
- *     int my_key;
- * }
- *
- * hash_table_t *table = ...;
- * int key = ...;
- *
- * hash_table_foreach(table, &key, my_link_member, struct ht_entry, item) {
- *     _print_entry_data(item->data);
- * }
- */
-#define hash_table_foreach(ht, key, member, itype, iterator) \
-        for (itype *iterator = NULL; \
-            iterator == NULL; iterator = (itype *) INTPTR_MAX) \
-                for (ht_link_t *__link = hash_table_find((ht), (key)); \
-                    __link != NULL && ((iterator = member_to_inst(__link, itype, member))); \
-                        __link = hash_table_find_next((ht), __link))
-
 extern bool hash_table_create(hash_table_t *, size_t, size_t,
     const hash_table_ops_t *);
@@ -120 +96 @@
 extern bool hash_table_insert_unique(hash_table_t *, ht_link_t *);
 extern ht_link_t *hash_table_find(const hash_table_t *, const void *);
-extern ht_link_t *hash_table_find_next(const hash_table_t *, ht_link_t *);
+extern ht_link_t *hash_table_find_next(const hash_table_t *, ht_link_t *,
+    ht_link_t *);
 extern size_t hash_table_remove(hash_table_t *, const void *);
 extern void hash_table_remove_item(hash_table_t *, ht_link_t *);