fix some hashtable warnings
This commit is contained in:
1 parent
00f24b8841
commit
7034bc6fb3
2 files changed
+14
-7
No files matched your search
+13
-7
@@ -215,14 +215,19 @@ hashtable* hashtable_Create(void) {
|
||||
return table;
|
||||
}
|
||||
|
||||
void hashtable_Destroy(hashtable* table) {
|
||||
void hashtable_Destroy(hashtable* table)
|
||||
{
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wcast-qual"
|
||||
// First free allocated keys.
|
||||
for (size_t i = 0; i < table->capacity; i++) {
|
||||
if (table->entries[i].key != NULL) {
|
||||
for (size_t i = 0; i < table->capacity; i++)
|
||||
{
|
||||
if (table->entries[i].key != NULL)
|
||||
{
|
||||
free((void*)table->entries[i].key);
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GCC diagnostic pop
|
||||
// Then free entries array and table itself.
|
||||
free(table->entries);
|
||||
free(table);
|
||||
@@ -293,7 +298,7 @@ static const char* ht_set_entry(ht_entry* entries, size_t capacity,
|
||||
}
|
||||
(*plength)++;
|
||||
}
|
||||
entries[index].key = (char*)key;
|
||||
entries[index].key = (const char*)key;
|
||||
entries[index].value = value;
|
||||
return key;
|
||||
}
|
||||
@@ -349,12 +354,13 @@ size_t hashtable_Length(hashtable* table) {
|
||||
return table->length;
|
||||
}
|
||||
|
||||
hashtable_iterator ht_iterator(hashtable* table) {
|
||||
/*static hashtable_iterator ht_iterator(hashtable* table)
|
||||
{
|
||||
hashtable_iterator it;
|
||||
it._table = table;
|
||||
it._index = 0;
|
||||
return it;
|
||||
}
|
||||
}*/
|
||||
|
||||
boolean hashtable_Next(hashtable_iterator* it) {
|
||||
// Loop till we've hit end of entries array.
|
||||
|
||||
@@ -10267,6 +10267,7 @@ void P_RemoveSavegameMobj(mobj_t *mobj, boolean preserveLevel)
|
||||
// stop any playing sound
|
||||
if (!preserveLevel)
|
||||
S_StopSound(mobj);
|
||||
|
||||
R_RemoveMobjInterpolator(mobj);
|
||||
|
||||
// just set its reference count to 0 to not trigger the assert in P_UnlinkThinker
|
||||
|
||||
Reference in new issue
Block a user