reftable: inline `merged_table_release()`

The function `merged_table_release()` releases a merged table, whereas
`reftable_merged_table_free()` releases a merged table and then also
free's its pointer. But all callsites of `merged_table_release()` are in
fact followed by `reftable_merged_table_free()`, which is redundant.

Inline `merged_table_release()` into `reftable_merged_table_free()` to
get rid of this redundance.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/reftable/merged.c b/reftable/merged.c
index f85a24c6786c6fb8e102ffc9ceb35f23706c8c9b..804fdc0de0aba1f7f4a825d5e55bb9b3a682f3df 100644 (file)
--- a/reftable/merged.c
+++ b/reftable/merged.c
@@ -207,19 +207,11 @@ int reftable_new_merged_table(struct reftable_merged_table **dest,
        return 0;
 }
 
-/* clears the list of subtable, without affecting the readers themselves. */
-void merged_table_release(struct reftable_merged_table *mt)
-{
-       FREE_AND_NULL(mt->stack);
-       mt->stack_len = 0;
-}
-
 void reftable_merged_table_free(struct reftable_merged_table *mt)
 {
-       if (!mt) {
+       if (!mt)
                return;
-       }
-       merged_table_release(mt);
+       FREE_AND_NULL(mt->stack);
        reftable_free(mt);
 }
 

diff --git a/reftable/merged.h b/reftable/merged.h
index a2571dbc99d68c9954e9d07372bae984cf5ccccc..9db45c31961930744e846c689d47693c3963f8db 100644 (file)
--- a/reftable/merged.h
+++ b/reftable/merged.h
@@ -24,6 +24,4 @@ struct reftable_merged_table {
        uint64_t max;
 };
 
-void merged_table_release(struct reftable_merged_table *mt);
-
 #endif

diff --git a/reftable/stack.c b/reftable/stack.c
index a59ebe038d01d215ca0a5a4e9b6d737a6dca344e..984fd866d051fd0db1eba5c5ac647dc4718e5e44 100644 (file)
--- a/reftable/stack.c
+++ b/reftable/stack.c
@@ -261,10 +261,8 @@ static int reftable_stack_reload_once(struct reftable_stack *st, char **names,
 
        new_tables = NULL;
        st->readers_len = new_readers_len;
-       if (st->merged) {
-               merged_table_release(st->merged);
+       if (st->merged)
                reftable_merged_table_free(st->merged);
-       }
        if (st->readers) {
                reftable_free(st->readers);
        }
@@ -968,10 +966,8 @@ static int stack_write_compact(struct reftable_stack *st,
 
 done:
        reftable_iterator_destroy(&it);
-       if (mt) {
-               merged_table_release(mt);
+       if (mt)
                reftable_merged_table_free(mt);
-       }
        reftable_ref_record_release(&ref);
        reftable_log_record_release(&log);
        st->stats.entries_written += entries;