Vita3K/unicorn
1
0
Fork 0
mirror of https://github.com/Vita3K/unicorn.git synced 2024-11-27 15:20:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

imlpement key destroy and value destroy callbacks in hash tables

Browse Source
This commit is contained in:
Chris Eagle 2016-12-18 15:28:11 -08:00
parent e46545f722
commit c7bd120650
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qemu/glib_compat.c
View File

@ -257,7 +257,7 @@ void g_slist_free_full(GSList *list, GDestroyNotify free_func) {
GSList *lp, *next;
for (lp = list; lp; lp = next) {
next = lp->next;
(*free_func)(lp->data);
if (free_func) (*free_func)(lp->data);
free(lp);
}
}
@ -453,7 +453,14 @@ void g_hash_table_remove_all(GHashTable *hash_table) {
if (hash_table == NULL) return;
int i;
for (i = 0; i < hash_table->size; i++) {
g_slist_free_full(hash_table->buckets[i], free);
GSList *lp;
for (lp = hash_table->buckets[i]; lp; lp = lp->next) {
KeyValue *kv = (KeyValue*)lp->data;
if (hash_table->key_destroy_func) (*hash_table->key_destroy_func)(kv->key);
if (hash_table->value_destroy_func) (*hash_table->value_destroy_func)(kv->value);
free(lp->data);
}
g_slist_free(hash_table->buckets[i]);
hash_table->buckets[i] = NULL;
}
hash_table->num_entries = 0;
@ -468,6 +475,8 @@ int g_hash_table_remove(GHashTable *hash_table, const void* key) {
KeyValue *kv = (KeyValue*)(lp->data);
int match = hash_table->key_equal_func ? (*hash_table->key_equal_func)(kv->key, key) : (kv->key == key);
if (match) {
if (hash_table->key_destroy_func) (*hash_table->key_destroy_func)(kv->key);
if (hash_table->value_destroy_func) (*hash_table->value_destroy_func)(kv->value);
free(kv);
if (prev == NULL) {
hash_table->buckets[bnum] = lp->next;