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>
Patrick Steinhardt committed
Jun 6, 2024 at 07:29 UTC
b5d7db9e83e16cad6fb2a055029a8d1c72af04c9
3 files changed
+4
-18
reftable/merged.c
+2
-10
@@ -207,19 +207,11 @@ int reftable_new_merged_table(struct reftable_merged_table **dest,
207
return 0;
208
}
209
210
-/* clears the list of subtable, without affecting the readers themselves. */
211
-void merged_table_release(struct reftable_merged_table *mt)
212
-{
213
- FREE_AND_NULL(mt->stack);
214
- mt->stack_len = 0;
215
-}
216
-
210
void reftable_merged_table_free(struct reftable_merged_table *mt)
211
{
219
- if (!mt) {
212
+ if (!mt)
213
return;
221
- }
222
- merged_table_release(mt);
214
+ FREE_AND_NULL(mt->stack);
215
reftable_free(mt);
216
}
217
reftable/merged.h
-2
@@ -24,6 +24,4 @@ struct reftable_merged_table {
24
uint64_t max;
25
};
26
27
-void merged_table_release(struct reftable_merged_table *mt);
28
-
27
#endif
reftable/stack.c
+2
-6
@@ -261,10 +261,8 @@ static int reftable_stack_reload_once(struct reftable_stack *st, char **names,
261
262
new_tables = NULL;
263
st->readers_len = new_readers_len;
264
- if (st->merged) {
265
- merged_table_release(st->merged);
264
+ if (st->merged)
265
reftable_merged_table_free(st->merged);
267
- }
266
if (st->readers) {
267
reftable_free(st->readers);
268
}
@@ -968,10 +966,8 @@ static int stack_write_compact(struct reftable_stack *st,
966
967
done:
968
reftable_iterator_destroy(&it);
971
- if (mt) {
972
- merged_table_release(mt);
969
+ if (mt)
970
reftable_merged_table_free(mt);
974
- }
971
reftable_ref_record_release(&ref);
972
reftable_log_record_release(&log);
973
st->stats.entries_written += entries;