mirror of
https://github.com/git/git.git
synced 2026-03-05 06:57:37 +01:00
builtin/rev-list: migrate missing_objects cleanup to oidmap_clear_with_free()
As part of the conversion away from oidmap_clear(), switch the missing_objects map to use oidmap_clear_with_free(). missing_objects stores struct missing_objects_map_entry instances, which own an xstrdup()'d path string in addition to the container struct itself. Previously, rev-list manually freed entry->path before calling oidmap_clear(&missing_objects, true). Introduce a dedicated free callback and pass it to oidmap_clear_with_free(), consolidating entry teardown into a single place and making cleanup semantics explicit. Signed-off-by: Seyi Kuforiji <kuforiji98@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
75ae563040
commit
bbf93f9a3a
@@ -88,9 +88,19 @@ static int arg_print_omitted; /* print objects omitted by filter */
|
||||
|
||||
struct missing_objects_map_entry {
|
||||
struct oidmap_entry entry;
|
||||
const char *path;
|
||||
char *path;
|
||||
unsigned type;
|
||||
};
|
||||
|
||||
static void free_missing_objects_entry(void *e)
|
||||
{
|
||||
struct missing_objects_map_entry *entry =
|
||||
container_of(e, struct missing_objects_map_entry, entry);
|
||||
|
||||
free(entry->path);
|
||||
free(entry);
|
||||
}
|
||||
|
||||
static struct oidmap missing_objects;
|
||||
enum missing_action {
|
||||
MA_ERROR = 0, /* fail if any missing objects are encountered */
|
||||
@@ -935,10 +945,9 @@ int cmd_rev_list(int argc,
|
||||
while ((entry = oidmap_iter_next(&iter))) {
|
||||
print_missing_object(entry, arg_missing_action ==
|
||||
MA_PRINT_INFO);
|
||||
free((void *)entry->path);
|
||||
}
|
||||
|
||||
oidmap_clear(&missing_objects, true);
|
||||
oidmap_clear_with_free(&missing_objects, free_missing_objects_entry);
|
||||
}
|
||||
|
||||
stop_progress(&progress);
|
||||
|
||||
Reference in New Issue
Block a user