+1 -1

builtin/rev-list.c

··· 924 924 free((void *)entry->path); 925 925 } 926 926 927 927 - oidmap_free(&missing_objects, true); 927 927 + oidmap_clear(&missing_objects, true); 928 928 } 929 929 930 930 stop_progress(&progress);

+1 -1

commit-graph.c

··· 222 222 223 223 if (replace_refs_enabled(r)) { 224 224 prepare_replace_object(r); 225 225 - if (hashmap_get_size(&r->objects->replace_map->map)) 225 225 + if (oidmap_get_size(&r->objects->replace_map)) 226 226 return 0; 227 227 } 228 228

+1 -1

list-objects-filter.c

··· 244 244 struct filter_trees_depth_data *d = filter_data; 245 245 if (!d) 246 246 return; 247 247 - oidmap_free(&d->seen_at_depth, 1); 247 247 + oidmap_clear(&d->seen_at_depth, 1); 248 248 free(d); 249 249 } 250 250

+1 -2

object-store.c

··· 987 987 { 988 988 FREE_AND_NULL(o->alternate_db); 989 989 990 990 - oidmap_free(o->replace_map, 1); 991 991 - FREE_AND_NULL(o->replace_map); 990 990 + oidmap_clear(&o->replace_map, 1); 992 991 pthread_mutex_destroy(&o->replace_mutex); 993 992 994 993 free_commit_graph(o->commit_graph);

+2 -1

object-store.h

··· 5 5 #include "object.h" 6 6 #include "list.h" 7 7 #include "oidset.h" 8 8 + #include "oidmap.h" 8 9 #include "thread-utils.h" 9 10 10 11 struct oidmap; ··· 109 110 * Objects that should be substituted by other objects 110 111 * (see git-replace(1)). 111 112 */ 112 112 - struct oidmap *replace_map; 113 113 + struct oidmap replace_map; 113 114 unsigned replace_map_initialized : 1; 114 115 pthread_mutex_t replace_mutex; /* protect object replace functions */ 115 116

+1 -1

oidmap.c

··· 22 22 hashmap_init(&map->map, oidmap_neq, NULL, initial_size); 23 23 } 24 24 25 25 - void oidmap_free(struct oidmap *map, int free_entries) 25 25 + void oidmap_clear(struct oidmap *map, int free_entries) 26 26 { 27 27 if (!map) 28 28 return;

+7 -2

oidmap.h

··· 36 36 void oidmap_init(struct oidmap *map, size_t initial_size); 37 37 38 38 /* 39 39 - * Frees an oidmap structure and allocated memory. 39 39 + * Clear an oidmap, freeing any allocated memory. The map is empty and 40 40 + * can be reused without another explicit init. 40 41 * 41 42 * If `free_entries` is true, each oidmap_entry in the map is freed as well 42 43 * using stdlibs free(). 43 44 */ 44 44 - void oidmap_free(struct oidmap *map, int free_entries); 45 45 + void oidmap_clear(struct oidmap *map, int free_entries); 45 46 46 47 /* 47 48 * Returns the oidmap entry for the specified oid, or NULL if not found. ··· 66 67 */ 67 68 void *oidmap_remove(struct oidmap *map, const struct object_id *key); 68 69 70 70 + static inline unsigned int oidmap_get_size(struct oidmap *map) 71 71 + { 72 72 + return hashmap_get_size(&map->map); 73 73 + } 69 74 70 75 struct oidmap_iter { 71 76 struct hashmap_iter h_iter;

+3 -5

replace-object.c

··· 31 31 oidcpy(&repl_obj->replacement, oid); 32 32 33 33 /* Register new object */ 34 34 - if (oidmap_put(r->objects->replace_map, repl_obj)) 34 34 + if (oidmap_put(&r->objects->replace_map, repl_obj)) 35 35 die(_("duplicate replace ref: %s"), refname); 36 36 37 37 return 0; ··· 48 48 return; 49 49 } 50 50 51 51 - r->objects->replace_map = 52 52 - xmalloc(sizeof(*r->objects->replace_map)); 53 53 - oidmap_init(r->objects->replace_map, 0); 51 51 + oidmap_init(&r->objects->replace_map, 0); 54 52 55 53 refs_for_each_replace_ref(get_main_ref_store(r), 56 54 register_replace_ref, r); ··· 80 78 /* Try to recursively replace the object */ 81 79 while (depth-- > 0) { 82 80 struct replace_object *repl_obj = 83 83 - oidmap_get(r->objects->replace_map, cur); 81 81 + oidmap_get(&r->objects->replace_map, cur); 84 82 if (!repl_obj) 85 83 return cur; 86 84 cur = &repl_obj->replacement;

+1 -1

replace-object.h

··· 47 47 { 48 48 if (!replace_refs_enabled(r) || 49 49 (r->objects->replace_map_initialized && 50 50 - r->objects->replace_map->map.tablesize == 0)) 50 50 + oidmap_get_size(&r->objects->replace_map) == 0)) 51 51 return oid; 52 52 return do_lookup_replace_object(r, oid); 53 53 }

+2 -2

sequencer.c

··· 6051 6051 oidset_clear(&interesting); 6052 6052 oidset_clear(&child_seen); 6053 6053 oidset_clear(&shown); 6054 6054 - oidmap_free(&commit2todo, 1); 6055 6055 - oidmap_free(&state.commit2label, 1); 6054 6054 + oidmap_clear(&commit2todo, 1); 6055 6055 + oidmap_clear(&state.commit2label, 1); 6056 6056 hashmap_clear_and_free(&state.labels, struct labels_entry, entry); 6057 6057 strbuf_release(&state.buf); 6058 6058

+1 -1

t/unit-tests/u-oidmap.c

··· 35 35 36 36 void test_oidmap__cleanup(void) 37 37 { 38 38 - oidmap_free(&map, 1); 38 38 + oidmap_clear(&map, 1); 39 39 } 40 40 41 41 void test_oidmap__replace(void)