[PATCH 2/5] builtin/rev-list: migrate missing_objects cleanup to oidmap_clear_with_free()
- From
Seyi Kuforiji <kuforiji98@gmail.com>
- Date
- Feb 27, 2026, 23:42 UTC
- Message-ID
- <20260227234213.17633-3-kuforiji98@gmail.com>
- In-Reply-To
- <20260227234213.17633-1-kuforiji98@gmail.com>
From: Seyi Kufoiji <kuforiji98@gmail.com>
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. This improves clarity and maintainability.
Signed-off-by: Seyi Kuforiji <kuforiji98@gmail.com> --- builtin/rev-list.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index ddea8aa251..567dc5e7f5 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -88,9 +88,17 @@ 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); +} + static struct oidmap missing_objects; enum missing_action { MA_ERROR = 0, /* fail if any missing objects are encountered */ @@ -935,10 +943,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);
-- 2.43.0