hashmap: introduce hashmap_free_entries
`hashmap_free_entries' behaves like `container_of' and passes the offset of the hashmap_entry struct to the internal `hashmap_free_' function, allowing the function to free any struct pointer regardless of where the hashmap_entry field is located. `hashmap_free' no longer takes any arguments aside from the hashmap itself. Signed-off-by: Eric Wong <e@80x24.org> Reviewed-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
8a973d0bb3
commit
c8e424c9c9
@ -4772,7 +4772,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
|
||||
|
||||
oidmap_free(&commit2todo, 1);
|
||||
oidmap_free(&state.commit2label, 1);
|
||||
hashmap_free(&state.labels, 1);
|
||||
hashmap_free_entries(&state.labels, struct labels_entry, entry);
|
||||
strbuf_release(&state.buf);
|
||||
|
||||
return 0;
|
||||
@ -5301,7 +5301,7 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)
|
||||
for (i = 0; i < todo_list->nr; i++)
|
||||
free(subjects[i]);
|
||||
free(subjects);
|
||||
hashmap_free(&subject2item, 1);
|
||||
hashmap_free_entries(&subject2item, struct subject2item_entry, entry);
|
||||
|
||||
clear_commit_todo_item(&commit_todo);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user