Skip to content

Allowed to skip destroying keys and values in HashMap #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olehermanse merged 1 commit into from
Oct 24, 2025
Merged

Allowed to skip destroying keys and values in HashMap #258

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions libutils/hash_map.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,14 @@ bool HashMapInsert(HashMap *map, void *key, void *value)
/* Replace the key with the new one despite those two being the
* same, since the new key might be referenced somewhere inside
* the new value. */
map->destroy_key_fn(i->value.key);
map->destroy_value_fn(i->value.value);
if (map->destroy_key_fn != NULL)
{
map->destroy_key_fn(i->value.key);
}
if (map->destroy_value_fn != NULL)
{
map->destroy_value_fn(i->value.value);
}
i->value.key = key;
i->value.value = value;
return true;
Expand Down Expand Up @@ -154,8 +160,14 @@ bool HashMapRemove(HashMap *map, const void *key)
BucketListItem *cur = *prev;
if (map->equal_fn(cur->value.key, key))
{
map->destroy_key_fn(cur->value.key);
map->destroy_value_fn(cur->value.value);
if (map->destroy_key_fn != NULL)
{
map->destroy_key_fn(cur->value.key);
}
if (map->destroy_value_fn != NULL)
{
map->destroy_value_fn(cur->value.value);
}
*prev = cur->next;
free(cur);
map->load--;
Expand Down Expand Up @@ -195,8 +207,14 @@ static void FreeBucketListItem(HashMap *map, BucketListItem *item)
FreeBucketListItem(map, item->next);
}

map->destroy_key_fn(item->value.key);
map->destroy_value_fn(item->value.value);
if (map->destroy_key_fn != NULL)
{
map->destroy_key_fn(item->value.key);
}
if (map->destroy_value_fn != NULL)
{
map->destroy_value_fn(item->value.value);
}
free(item);
map->load--;
}
Expand Down
Loading