From 8e03ea438342d6228e3b81fef9a8d4bab6327a01 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Mon, 9 Oct 2023 19:20:43 -0400
Subject: [PATCH] hashtable: Use Create/Destroy naming, in the SDL3 style.
---
src/SDL_hashtable.c | 10 +++++-----
src/SDL_hashtable.h | 16 ++++++++--------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/SDL_hashtable.c b/src/SDL_hashtable.c
index 59f2999c9906..e4b301c54776 100644
--- a/src/SDL_hashtable.c
+++ b/src/SDL_hashtable.c
@@ -40,10 +40,10 @@ struct SDL_HashTable
SDL_HashTable_NukeFn nuke;
};
-SDL_HashTable *SDL_NewHashTable(void *data, const Uint32 num_buckets, const SDL_HashTable_HashFn hashfn,
- const SDL_HashTable_KeyMatchFn keymatchfn,
- const SDL_HashTable_NukeFn nukefn,
- const SDL_bool stackable)
+SDL_HashTable *SDL_CreateHashTable(void *data, const Uint32 num_buckets, const SDL_HashTable_HashFn hashfn,
+ const SDL_HashTable_KeyMatchFn keymatchfn,
+ const SDL_HashTable_NukeFn nukefn,
+ const SDL_bool stackable)
{
SDL_HashTable *table;
@@ -209,7 +209,7 @@ SDL_bool SDL_IterateHashTableKeys(const SDL_HashTable *table, const void **_key,
return SDL_TRUE;
}
-void SDL_FreeHashTable(SDL_HashTable *table)
+void SDL_DestroyHashTable(SDL_HashTable *table)
{
if (table != NULL) {
void *data = table->data;
diff --git a/src/SDL_hashtable.h b/src/SDL_hashtable.h
index 1e0a611c1e76..cb03b0c1fd78 100644
--- a/src/SDL_hashtable.h
+++ b/src/SDL_hashtable.h
@@ -29,14 +29,14 @@ typedef Uint32 (*SDL_HashTable_HashFn)(const void *key, void *data);
typedef SDL_bool (*SDL_HashTable_KeyMatchFn)(const void *a, const void *b, void *data);
typedef void (*SDL_HashTable_NukeFn)(const void *key, const void *value, void *data);
-SDL_HashTable *SDL_NewHashTable(void *data,
- const Uint32 num_buckets,
- const SDL_HashTable_HashFn hashfn,
- const SDL_HashTable_KeyMatchFn keymatchfn,
- const SDL_HashTable_NukeFn nukefn,
- const SDL_bool stackable);
-
-void SDL_FreeHashTable(SDL_HashTable *table);
+SDL_HashTable *SDL_CreateHashTable(void *data,
+ const Uint32 num_buckets,
+ const SDL_HashTable_HashFn hashfn,
+ const SDL_HashTable_KeyMatchFn keymatchfn,
+ const SDL_HashTable_NukeFn nukefn,
+ const SDL_bool stackable);
+
+void SDL_DestroyHashTable(SDL_HashTable *table);
SDL_bool SDL_InsertIntoHashTable(SDL_HashTable *table, const void *key, const void *value);
SDL_bool SDL_RemoveFromHashTable(SDL_HashTable *table, const void *key);
SDL_bool SDL_FindInHashTable(const SDL_HashTable *table, const void *key, const void **_value);