reftable/reader: inline `reader_close()`
Same as with the preceding commit, we also provide a `reader_close()` function that allows the caller to close a reader without freeing it. This is unnecessary now that all users will have an allocated version of the reader. Inline it into `reftable_reader_free()`. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Aug 23, 2024 at 16:12 UTC
00e130a6bb3535de2a1a5f96640a8723fef09c87
3 files changed
+3
-12
reftable/reader.c
+2
-7
@@ -579,12 +579,6 @@ void reftable_reader_init_log_iterator(struct reftable_reader *r,
579
reader_init_iter(r, it, BLOCK_TYPE_LOG);
580
}
581
582
-void reader_close(struct reftable_reader *r)
583
-{
584
- block_source_close(&r->source);
585
- FREE_AND_NULL(r->name);
586
-}
587
-
582
int reftable_reader_new(struct reftable_reader **out,
583
struct reftable_block_source *source, char const *name)
584
{
@@ -655,7 +649,8 @@ void reftable_reader_free(struct reftable_reader *r)
649
{
650
if (!r)
651
return;
658
- reader_close(r);
652
+ block_source_close(&r->source);
653
+ FREE_AND_NULL(r->name);
654
reftable_free(r);
655
}
656
reftable/reader.h
-1
@@ -52,7 +52,6 @@ struct reftable_reader {
52
struct reftable_reader_offsets log_offsets;
53
};
54
55
-void reader_close(struct reftable_reader *r);
55
const char *reader_name(struct reftable_reader *r);
56
57
void reader_init_iter(struct reftable_reader *r,
reftable/stack.c
+1
-4
@@ -290,7 +290,6 @@ static int reftable_stack_reload_once(struct reftable_stack *st,
290
const char *name = reader_name(cur[i]);
291
stack_filename(&table_path, st, name);
292
293
- reader_close(cur[i]);
293
reftable_reader_free(cur[i]);
294
295
/* On Windows, can only unlink after closing. */
@@ -299,10 +298,8 @@ static int reftable_stack_reload_once(struct reftable_stack *st,
298
}
299
300
done:
302
- for (i = 0; i < new_readers_len; i++) {
303
- reader_close(new_readers[i]);
301
+ for (i = 0; i < new_readers_len; i++)
302
reftable_reader_free(new_readers[i]);
305
- }
303
reftable_free(new_readers);
304
reftable_free(cur);
305
strbuf_release(&table_path);