fixup??? Add a function to determine unique prefixes for a list of strings

This is needed to accommodate for stricter checking of the
`hashmap_*()` function family.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

prefix-map.c

@@ -2,12 +2,14 @@
 #include "prefix-map.h"
 
 static int map_cmp(const void *unused_cmp_data,
-		   const void *entry,
-		   const void *entry_or_key,
+		   const struct hashmap_entry *entry,
+		   const struct hashmap_entry *entry_or_key,
 		   const void *unused_keydata)
 {
-	const struct prefix_map_entry *a = entry;
-	const struct prefix_map_entry *b = entry_or_key;
+	const struct prefix_map_entry *a =
+		container_of(entry, const struct prefix_map_entry, e);
+	const struct prefix_map_entry *b =
+		container_of(entry_or_key, const struct prefix_map_entry, e);
 
 	return a->prefix_length != b->prefix_length ||
 		strncmp(a->name, b->name, a->prefix_length);
@@ -20,8 +22,8 @@ static void add_prefix_entry(struct hashmap *map, const char *name,
 	result->name = name;
 	result->prefix_length = prefix_length;
 	result->item = item;
-	hashmap_entry_init(result, memhash(name, prefix_length));
-	hashmap_add(map, result);
+	hashmap_entry_init(&result->e, memhash(name, prefix_length));
+	hashmap_add(map, &result->e);
 }
 
 static void init_prefix_map(struct prefix_map *prefix_map,
@@ -48,8 +50,8 @@ static void add_prefix_item(struct prefix_map *prefix_map,
 			break;
 
 		e.prefix_length = j;
-		hashmap_entry_init(&e, memhash(e.name, j));
-		e2 = hashmap_get(&prefix_map->map, &e, NULL);
+		hashmap_entry_init(&e.e, memhash(e.name, j));
+		e2 = hashmap_get_entry(&prefix_map->map, &e, e, NULL);
 		if (!e2) {
 			/* prefix is unique at this stage */
 			item->prefix_length = j;
@@ -105,5 +107,5 @@ void find_unique_prefixes(struct prefix_item **list, size_t nr,
 	init_prefix_map(&prefix_map, min_length, max_length);
 	for (i = 0; i < nr; i++)
 		add_prefix_item(&prefix_map, list[i]);
-	hashmap_free(&prefix_map.map, 1);
+	hashmap_free_entries(&prefix_map.map, struct prefix_map_entry, e);
 }