Merge branch 'en/strmap'

[thirdparty/git.git] / range-diff.c

diff --git a/range-diff.c b/range-diff.c
index 24dc435e482c0364ebc88e7ad55930f437d73ad2..b9950f10c8c486b16a2b916b0898d88c8d82fb59 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -232,11 +232,9 @@ static int patch_util_cmp(const void *dummy, const struct patch_util *a,
 
 static void find_exact_matches(struct string_list *a, struct string_list *b)
 {
-       struct hashmap map;
+       struct hashmap map = HASHMAP_INIT((hashmap_cmp_fn)patch_util_cmp, NULL);
        int i;
 
-       hashmap_init(&map, (hashmap_cmp_fn)patch_util_cmp, NULL, 0);
-
        /* First, add the patches of a to a hash map */
        for (i = 0; i < a->nr; i++) {
                struct patch_util *util = a->items[i].util;
@@ -266,7 +264,7 @@ static void find_exact_matches(struct string_list *a, struct string_list *b)
                }
        }
 
-       hashmap_free(&map);
+       hashmap_clear(&map);
 }
 
 static void diffsize_consume(void *data, char *line, unsigned long len)