Skip to content

Commit f177d49

Browse files
pks-tttaylorr
pks-t
authored and
ttaylorr
committed
reftable/blocksource: adapt interface name
Adapt the name of the `strbuf` block source to no longer relate to this interface, but instead to the `reftable_buf` interface. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Taylor Blau <me@ttaylorr.com>
1 parent be4c070 commit f177d49

File tree

6 files changed

+36
-36
lines changed

6 files changed

+36
-36
lines changed

‎reftable/blocksource.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ license that can be found in the LICENSE file or at
1313
#include "reftable-blocksource.h"
1414
#include "reftable-error.h"
1515

16-
static void strbuf_return_block(void *b UNUSED, struct reftable_block *dest)
16+
static void reftable_buf_return_block(void *b UNUSED, struct reftable_block *dest)
1717
{
1818
if (dest->len)
1919
memset(dest->data, 0xff, dest->len);
2020
reftable_free(dest->data);
2121
}
2222

23-
static void strbuf_close(void *b UNUSED)
23+
static void reftable_buf_close(void *b UNUSED)
2424
{
2525
}
2626

27-
static int strbuf_read_block(void *v, struct reftable_block *dest, uint64_t off,
28-
uint32_t size)
27+
static int reftable_buf_read_block(void *v, struct reftable_block *dest,
28+
uint64_t off, uint32_t size)
2929
{
3030
struct reftable_buf *b = v;
3131
assert(off + size <= b->len);
@@ -37,23 +37,23 @@ static int strbuf_read_block(void *v, struct reftable_block *dest, uint64_t off,
3737
return size;
3838
}
3939

40-
static uint64_t strbuf_size(void *b)
40+
static uint64_t reftable_buf_size(void *b)
4141
{
4242
return ((struct reftable_buf *)b)->len;
4343
}
4444

45-
static struct reftable_block_source_vtable strbuf_vtable = {
46-
.size = &strbuf_size,
47-
.read_block = &strbuf_read_block,
48-
.return_block = &strbuf_return_block,
49-
.close = &strbuf_close,
45+
static struct reftable_block_source_vtable reftable_buf_vtable = {
46+
.size = &reftable_buf_size,
47+
.read_block = &reftable_buf_read_block,
48+
.return_block = &reftable_buf_return_block,
49+
.close = &reftable_buf_close,
5050
};
5151

52-
void block_source_from_strbuf(struct reftable_block_source *bs,
53-
struct reftable_buf *buf)
52+
void block_source_from_buf(struct reftable_block_source *bs,
53+
struct reftable_buf *buf)
5454
{
5555
assert(!bs->ops);
56-
bs->ops = &strbuf_vtable;
56+
bs->ops = &reftable_buf_vtable;
5757
bs->arg = buf;
5858
}
5959

‎reftable/blocksource.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ struct reftable_block_source;
1515
struct reftable_buf;
1616

1717
/* Create an in-memory block source for reading reftables */
18-
void block_source_from_strbuf(struct reftable_block_source *bs,
19-
struct reftable_buf *buf);
18+
void block_source_from_buf(struct reftable_block_source *bs,
19+
struct reftable_buf *buf);
2020

2121
#endif

‎t/unit-tests/t-reftable-block.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static void t_ref_block_read_write(void)
3434
REFTABLE_CALLOC_ARRAY(block.data, block_size);
3535
check(block.data != NULL);
3636
block.len = block_size;
37-
block_source_from_strbuf(&block.source ,&buf);
37+
block_source_from_buf(&block.source ,&buf);
3838
ret = block_writer_init(&bw, BLOCK_TYPE_REF, block.data, block_size,
3939
header_off, hash_size(GIT_SHA1_FORMAT_ID));
4040
check(!ret);
@@ -128,7 +128,7 @@ static void t_log_block_read_write(void)
128128
REFTABLE_CALLOC_ARRAY(block.data, block_size);
129129
check(block.data != NULL);
130130
block.len = block_size;
131-
block_source_from_strbuf(&block.source ,&buf);
131+
block_source_from_buf(&block.source ,&buf);
132132
ret = block_writer_init(&bw, BLOCK_TYPE_LOG, block.data, block_size,
133133
header_off, hash_size(GIT_SHA1_FORMAT_ID));
134134
check(!ret);
@@ -218,7 +218,7 @@ static void t_obj_block_read_write(void)
218218
REFTABLE_CALLOC_ARRAY(block.data, block_size);
219219
check(block.data != NULL);
220220
block.len = block_size;
221-
block_source_from_strbuf(&block.source, &buf);
221+
block_source_from_buf(&block.source, &buf);
222222
ret = block_writer_init(&bw, BLOCK_TYPE_OBJ, block.data, block_size,
223223
header_off, hash_size(GIT_SHA1_FORMAT_ID));
224224
check(!ret);
@@ -302,7 +302,7 @@ static void t_index_block_read_write(void)
302302
REFTABLE_CALLOC_ARRAY(block.data, block_size);
303303
check(block.data != NULL);
304304
block.len = block_size;
305-
block_source_from_strbuf(&block.source, &buf);
305+
block_source_from_buf(&block.source, &buf);
306306
ret = block_writer_init(&bw, BLOCK_TYPE_INDEX, block.data, block_size,
307307
header_off, hash_size(GIT_SHA1_FORMAT_ID));
308308
check(!ret);

‎t/unit-tests/t-reftable-merged.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ merged_table_from_records(struct reftable_ref_record **refs,
3535

3636
for (size_t i = 0; i < n; i++) {
3737
t_reftable_write_to_buf(&buf[i], refs[i], sizes[i], NULL, 0, &opts);
38-
block_source_from_strbuf(&(*source)[i], &buf[i]);
38+
block_source_from_buf(&(*source)[i], &buf[i]);
3939

4040
err = reftable_reader_new(&(*readers)[i], &(*source)[i],
4141
"name");
@@ -293,7 +293,7 @@ merged_table_from_log_records(struct reftable_log_record **logs,
293293

294294
for (size_t i = 0; i < n; i++) {
295295
t_reftable_write_to_buf(&buf[i], NULL, 0, logs[i], sizes[i], &opts);
296-
block_source_from_strbuf(&(*source)[i], &buf[i]);
296+
block_source_from_buf(&(*source)[i], &buf[i]);
297297

298298
err = reftable_reader_new(&(*readers)[i], &(*source)[i],
299299
"name");
@@ -442,7 +442,7 @@ static void t_default_write_opts(void)
442442
check(!err);
443443
reftable_writer_free(w);
444444

445-
block_source_from_strbuf(&source, &buf);
445+
block_source_from_buf(&source, &buf);
446446

447447
err = reftable_reader_new(&rd, &source, "filename");
448448
check(!err);

‎t/unit-tests/t-reftable-reader.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static int t_reader_seek_once(void)
2020
int ret;
2121

2222
t_reftable_write_to_buf(&buf, records, ARRAY_SIZE(records), NULL, 0, NULL);
23-
block_source_from_strbuf(&source, &buf);
23+
block_source_from_buf(&source, &buf);
2424

2525
ret = reftable_reader_new(&reader, &source, "name");
2626
check(!ret);
@@ -61,7 +61,7 @@ static int t_reader_reseek(void)
6161
int ret;
6262

6363
t_reftable_write_to_buf(&buf, records, ARRAY_SIZE(records), NULL, 0, NULL);
64-
block_source_from_strbuf(&source, &buf);
64+
block_source_from_buf(&source, &buf);
6565

6666
ret = reftable_reader_new(&reader, &source, "name");
6767
check(!ret);

‎t/unit-tests/t-reftable-readwrite.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ static void t_buffer(void)
2424
int n;
2525
uint8_t in[] = "hello";
2626
reftable_buf_add(&buf, in, sizeof(in));
27-
block_source_from_strbuf(&source, &buf);
27+
block_source_from_buf(&source, &buf);
2828
check_int(block_source_size(&source), ==, 6);
2929
n = block_source_read_block(&source, &out, 0, sizeof(in));
3030
check_int(n, ==, sizeof(in));
@@ -207,7 +207,7 @@ static void t_log_write_read(void)
207207
reftable_writer_free(w);
208208
w = NULL;
209209

210-
block_source_from_strbuf(&source, &buf);
210+
block_source_from_buf(&source, &buf);
211211

212212
err = reftable_reader_new(&reader, &source, "file.log");
213213
check(!err);
@@ -298,7 +298,7 @@ static void t_log_zlib_corruption(void)
298298
/* corrupt the data. */
299299
buf.buf[50] ^= 0x99;
300300

301-
block_source_from_strbuf(&source, &buf);
301+
block_source_from_buf(&source, &buf);
302302

303303
err = reftable_reader_new(&reader, &source, "file.log");
304304
check(!err);
@@ -328,7 +328,7 @@ static void t_table_read_write_sequential(void)
328328

329329
write_table(&names, &buf, N, 256, GIT_SHA1_FORMAT_ID);
330330

331-
block_source_from_strbuf(&source, &buf);
331+
block_source_from_buf(&source, &buf);
332332

333333
err = reftable_reader_new(&reader, &source, "file.ref");
334334
check(!err);
@@ -380,7 +380,7 @@ static void t_table_read_api(void)
380380

381381
write_table(&names, &buf, N, 256, GIT_SHA1_FORMAT_ID);
382382

383-
block_source_from_strbuf(&source, &buf);
383+
block_source_from_buf(&source, &buf);
384384

385385
err = reftable_reader_new(&reader, &source, "file.ref");
386386
check(!err);
@@ -416,7 +416,7 @@ static void t_table_read_write_seek(int index, int hash_id)
416416

417417
write_table(&names, &buf, N, 256, hash_id);
418418

419-
block_source_from_strbuf(&source, &buf);
419+
block_source_from_buf(&source, &buf);
420420

421421
err = reftable_reader_new(&reader, &source, "file.ref");
422422
check(!err);
@@ -538,7 +538,7 @@ static void t_table_refs_for(int indexed)
538538
reftable_writer_free(w);
539539
w = NULL;
540540

541-
block_source_from_strbuf(&source, &buf);
541+
block_source_from_buf(&source, &buf);
542542

543543
err = reftable_reader_new(&reader, &source, "file.ref");
544544
check(!err);
@@ -600,7 +600,7 @@ static void t_write_empty_table(void)
600600

601601
check_int(buf.len, ==, header_size(1) + footer_size(1));
602602

603-
block_source_from_strbuf(&source, &buf);
603+
block_source_from_buf(&source, &buf);
604604

605605
err = reftable_reader_new(&rd, &source, "filename");
606606
check(!err);
@@ -806,7 +806,7 @@ static void t_write_multiple_indices(void)
806806
check_int(stats->obj_stats.index_offset, >, 0);
807807
check_int(stats->log_stats.index_offset, >, 0);
808808

809-
block_source_from_strbuf(&source, &writer_buf);
809+
block_source_from_buf(&source, &writer_buf);
810810
err = reftable_reader_new(&reader, &source, "filename");
811811
check(!err);
812812

@@ -863,7 +863,7 @@ static void t_write_multi_level_index(void)
863863
stats = reftable_writer_stats(writer);
864864
check_int(stats->ref_stats.max_index_level, ==, 2);
865865

866-
block_source_from_strbuf(&source, &writer_buf);
866+
block_source_from_buf(&source, &writer_buf);
867867
err = reftable_reader_new(&reader, &source, "filename");
868868
check(!err);
869869

@@ -889,7 +889,7 @@ static void t_corrupt_table_empty(void)
889889
struct reftable_reader *reader;
890890
int err;
891891

892-
block_source_from_strbuf(&source, &buf);
892+
block_source_from_buf(&source, &buf);
893893
err = reftable_reader_new(&reader, &source, "file.log");
894894
check_int(err, ==, REFTABLE_FORMAT_ERROR);
895895
}
@@ -903,7 +903,7 @@ static void t_corrupt_table(void)
903903
int err;
904904
reftable_buf_add(&buf, zeros, sizeof(zeros));
905905

906-
block_source_from_strbuf(&source, &buf);
906+
block_source_from_buf(&source, &buf);
907907
err = reftable_reader_new(&reader, &source, "file.log");
908908
check_int(err, ==, REFTABLE_FORMAT_ERROR);
909909

0 commit comments

Comments
 (0)