fast-export: simplify initialization of anonymized hashmaps

We take pains to avoid doing a lookup on a hashmap which has not been
initialized with hashmap_init(). That was necessary back when this code
was written. But hashmap_get() became safer in b7879b0ba6e (hashmap:
allow re-use after hashmap_free(), 2020-11-02). Since then it's OK to
call functions on a zero-initialized table; it will just correctly
return NULL, since there is no match.

This simplifies the code a little, and also lets us keep the
initialization line closer to when we add an entry (which is when the
hashmap really does need to be totally initialized). That will help
later refactoring.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index f422819c82a32d27d0dc73c821c033bb190dffa2..ba9ab3a97e5e0f3125ffc890d3a0ae85a2b31305 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -152,18 +152,12 @@ static const char *anonymize_str(struct hashmap *map,
        struct anonymized_entry_key key;
        struct anonymized_entry *ret;
 
-       if (!map->cmpfn)
-               hashmap_init(map, anonymized_entry_cmp, NULL, 0);
-
        hashmap_entry_init(&key.hash, memhash(orig, len));
        key.orig = orig;
        key.orig_len = len;
 
        /* First check if it's a token the user configured manually... */
-       if (anonymized_seeds.cmpfn)
-               ret = hashmap_get_entry(&anonymized_seeds, &key, hash, &key);
-       else
-               ret = NULL;
+       ret = hashmap_get_entry(&anonymized_seeds, &key, hash, &key);
 
        /* ...otherwise check if we've already seen it in this context... */
        if (!ret)
@@ -171,6 +165,9 @@ static const char *anonymize_str(struct hashmap *map,
 
        /* ...and finally generate a new mapping if necessary */
        if (!ret) {
+               if (!map->cmpfn)
+                       hashmap_init(map, anonymized_entry_cmp, NULL, 0);
+
                FLEX_ALLOC_MEM(ret, orig, orig, len);
                hashmap_entry_init(&ret->hash, key.hash.hash);
                ret->anon = generate(data);