reftable/blocksource: consolidate code into a single file

The code that implements block sources is distributed across a couple of
files. Consolidate all of it into "reftable/blocksource.c" and its
accompanying header so that it is easier to locate and more self
contained.

While at it, rename some of the functions to have properly scoped names.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2025-04-07 15:16:15 +02:00
committed by Junio C Hamano
parent b648bd6549
commit 1ac4e5e83d
10 changed files with 80 additions and 62 deletions

View File

@@ -100,7 +100,7 @@ static void t_ref_block_read_write(void)
block_reader_release(&br);
block_iter_close(&it);
reftable_record_release(&rec);
reftable_block_done(&br.block);
block_source_return_block(&br.block);
reftable_buf_release(&want);
reftable_buf_release(&buf);
for (i = 0; i < N; i++)
@@ -190,7 +190,7 @@ static void t_log_block_read_write(void)
block_reader_release(&br);
block_iter_close(&it);
reftable_record_release(&rec);
reftable_block_done(&br.block);
block_source_return_block(&br.block);
reftable_buf_release(&want);
reftable_buf_release(&buf);
for (i = 0; i < N; i++)
@@ -273,7 +273,7 @@ static void t_obj_block_read_write(void)
block_reader_release(&br);
block_iter_close(&it);
reftable_record_release(&rec);
reftable_block_done(&br.block);
block_source_return_block(&br.block);
reftable_buf_release(&want);
reftable_buf_release(&buf);
for (i = 0; i < N; i++)
@@ -365,7 +365,7 @@ static void t_index_block_read_write(void)
block_reader_release(&br);
block_iter_close(&it);
reftable_record_release(&rec);
reftable_block_done(&br.block);
block_source_return_block(&br.block);
reftable_buf_release(&want);
reftable_buf_release(&buf);
for (i = 0; i < N; i++)

View File

@@ -32,13 +32,13 @@ static void t_buffer(void)
n = block_source_read_block(&source, &out, 0, sizeof(in));
check_int(n, ==, sizeof(in));
check(!memcmp(in, out.data, n));
reftable_block_done(&out);
block_source_return_block(&out);
n = block_source_read_block(&source, &out, 1, 2);
check_int(n, ==, 2);
check(!memcmp(out.data, "el", 2));
reftable_block_done(&out);
block_source_return_block(&out);
block_source_close(&source);
reftable_buf_release(&buf);
}