fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 04:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util/hash_table: Use FREE() to be consistent with the CALLOC_STRUCT() call

Browse source 
CALLOC_STRUCT() calls the OS abstraction layer to do the allocation.
Call FREE() to free the corresponding objects so we keep things
consistent and have proper debug traces when memory-debugging
is enabled.

Fixes: 6649b840c3 ("mesa/util: add a hash table wrapper which support 64-bit keys")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26423>
(cherry picked from commit 977cc3157d)
This commit is contained in:
Boris Brezillon 2023-12-01 18:39:31 +01:00 • committed by Eric Engestrom
parent 9cabb39d8f
commit b02dc14ff7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -34,7 +34,7 @@
"description": "util/hash_table: Use FREE() to be consistent with the CALLOC_STRUCT() call",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "6649b840c34016b4753e69d4513a8d09da9febb2",
"notes": null

4
src/util/hash_table.c
View file

@ -802,7 +802,7 @@ _mesa_hash_table_u64_delete_key(struct hash_entry *entry)
struct hash_key_u64 *_key = (struct hash_key_u64 *)entry->key;
if (_key)
free(_key);
FREE(_key);
}
void
@ -905,6 +905,6 @@ _mesa_hash_table_u64_remove(struct hash_table_u64 *ht, uint64_t key)
struct hash_key *_key = (struct hash_key *)entry->key;
_mesa_hash_table_remove(ht->table, entry);
free(_key);
FREE(_key);
}
}