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
@ -109,7 +109,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
|
||||
hashmap_add(&map, &entries[i]->ent);
|
||||
}
|
||||
|
||||
hashmap_free(&map, 0);
|
||||
hashmap_free(&map);
|
||||
}
|
||||
} else {
|
||||
/* test map lookups */
|
||||
@ -129,7 +129,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
|
||||
}
|
||||
}
|
||||
|
||||
hashmap_free(&map, 0);
|
||||
hashmap_free(&map);
|
||||
}
|
||||
}
|
||||
|
||||
@ -266,6 +266,6 @@ int cmd__hashmap(int argc, const char **argv)
|
||||
}
|
||||
|
||||
strbuf_release(&line);
|
||||
hashmap_free(&map, 1);
|
||||
hashmap_free_entries(&map, struct test_entry, ent);
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user