mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-06 03:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

hashtable: SDL_IterateHashTable might as well provide both key and value.

Browse Source 
And SDL_IterateHashTableKey is only necessary for stackable hashtables, since
non-stackable ones can either iterate each unique key/value pair with
SDL_IterateHashTable, or get a specific key/value pair by using
SDL_FindInHashTable.
This commit is contained in:
Ryan C. Gordon
2023-10-14 13:23:03 -04:00
parent 95a9271dbf
commit 0aba2c97db
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/SDL_hashtable.c
View File

@@ -161,9 +161,9 @@ SDL_bool SDL_RemoveFromHashTable(SDL_HashTable *table, const void *key)
return SDL_FALSE; return SDL_FALSE;
} }
SDL_bool SDL_IterateHashTable(const SDL_HashTable *table, const void *key, const void **_value, void **iter) SDL_bool SDL_IterateHashTableKey(const SDL_HashTable *table, const void *key, const void **_value, void **iter)
{ {
SDL_HashItem *item = iter ? ((SDL_HashItem *) *iter)->next : table->table[calc_hash(table, key)]; SDL_HashItem *item = *iter ? ((SDL_HashItem *) *iter)->next : table->table[calc_hash(table, key)];
while (item != NULL) { while (item != NULL) {
if (table->keymatch(key, item->key, table->data)) { if (table->keymatch(key, item->key, table->data)) {
@@ -180,7 +180,7 @@ SDL_bool SDL_IterateHashTable(const SDL_HashTable *table, const void *key, const
return SDL_FALSE; return SDL_FALSE;
} }
SDL_bool SDL_IterateHashTableKeys(const SDL_HashTable *table, const void **_key, void **iter) SDL_bool SDL_IterateHashTable(const SDL_HashTable *table, const void **_key, const void **_value, void **iter)
{ {
SDL_HashItem *item = (SDL_HashItem *) *iter; SDL_HashItem *item = (SDL_HashItem *) *iter;
Uint32 idx = 0; Uint32 idx = 0;
@@ -189,7 +189,7 @@ SDL_bool SDL_IterateHashTableKeys(const SDL_HashTable *table, const void **_key,
const SDL_HashItem *orig = item; const SDL_HashItem *orig = item;
item = item->next; item = item->next;
if (item == NULL) { if (item == NULL) {
idx = calc_hash(table, orig->key) + 1; idx = calc_hash(table, orig->key) + 1; // !!! FIXME: we probably shouldn't rehash each time.
} }
} }
@@ -204,7 +204,9 @@ SDL_bool SDL_IterateHashTableKeys(const SDL_HashTable *table, const void **_key,
} }
*_key = item->key; *_key = item->key;
*_value = item->value;
*iter = item; *iter = item;
return SDL_TRUE; return SDL_TRUE;
} }

7
src/SDL_hashtable.h
View File

@@ -42,8 +42,11 @@ SDL_bool SDL_RemoveFromHashTable(SDL_HashTable *table, const void *key);
SDL_bool SDL_FindInHashTable(const SDL_HashTable *table, const void *key, const void **_value); SDL_bool SDL_FindInHashTable(const SDL_HashTable *table, const void *key, const void **_value);
SDL_bool SDL_HashTableEmpty(SDL_HashTable *table); SDL_bool SDL_HashTableEmpty(SDL_HashTable *table);
SDL_bool SDL_IterateHashTable(const SDL_HashTable *table, const void *key, const void **_value, void **iter); // iterate all values for a specific key. This only makes sense if the hash is stackable. If not-stackable, just use SDL_FindInHashTable().
SDL_bool SDL_IterateHashTableKeys(const SDL_HashTable *table, const void **_key, void **iter); SDL_bool SDL_IterateHashTableKey(const SDL_HashTable *table, const void *key, const void **_value, void **iter);
// iterate all key/value pairs in a hash (stackable hashes can have duplicate keys with multiple values).
SDL_bool SDL_IterateHashTable(const SDL_HashTable *table, const void **_key, const void **_value, void **iter);
Uint32 SDL_HashString(const void *key, void *unused); Uint32 SDL_HashString(const void *key, void *unused);
SDL_bool SDL_KeyMatchString(const void *a, const void *b, void *unused); SDL_bool SDL_KeyMatchString(const void *a, const void *b, void *unused);