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>

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 99f876ba857579ee8418b2256fc57e1e48022bd5..3bf30e1467adff458133daee873a54eef26ff4af 100644 (file)
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -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 missing_objects_map_entry_free(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, missing_objects_map_entry_free);
        }
 
        stop_progress(&progress);