@matheusbsbs / matheus-bagliano / commits / f177d49163

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>

Patrick Steinhardt committed Oct 17, 2024 at 06:53 UTC f177d491637a3771f19055cb3873bda9c163c91a

6 files changed +36 -36

reftable/blocksource.c

+13 -13

@@ -13,19 +13,19 @@ https://developers.google.com/open-source/licenses/bsd

13 #include "reftable-blocksource.h"

14 #include "reftable-error.h"

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)

17 {

18 if (dest->len)

19 memset(dest->data, 0xff, dest->len);

20 reftable_free(dest->data);

21 }

23 -static void strbuf_close(void *b UNUSED)

23 +static void reftable_buf_close(void *b UNUSED)

24 {

25 }

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)

29 {

30 struct reftable_buf *b = v;

31 assert(off + size <= b->len);

@@ -37,23 +37,23 @@ static int strbuf_read_block(void *v, struct reftable_block *dest, uint64_t off,

37 return size;

38 }

40 -static uint64_t strbuf_size(void *b)

40 +static uint64_t reftable_buf_size(void *b)

41 {

42 return ((struct reftable_buf *)b)->len;

43 }

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,

50 };

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)

54 {

55 assert(!bs->ops);

56 - bs->ops = &strbuf_vtable;

56 + bs->ops = &reftable_buf_vtable;

57 bs->arg = buf;

58 }

reftable/blocksource.h

+2 -2

@@ -15,7 +15,7 @@ struct reftable_block_source;

15 struct reftable_buf;

17 /* 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);

21 #endif

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

+4 -4

@@ -34,7 +34,7 @@ static void t_ref_block_read_write(void)

34 REFTABLE_CALLOC_ARRAY(block.data, block_size);

35 check(block.data != NULL);

36 block.len = block_size;

37 - block_source_from_strbuf(&block.source ,&buf);

37 + block_source_from_buf(&block.source ,&buf);

38 ret = block_writer_init(&bw, BLOCK_TYPE_REF, block.data, block_size,

39 header_off, hash_size(GIT_SHA1_FORMAT_ID));

40 check(!ret);

@@ -128,7 +128,7 @@ static void t_log_block_read_write(void)

128 REFTABLE_CALLOC_ARRAY(block.data, block_size);

129 check(block.data != NULL);

130 block.len = block_size;

131 - block_source_from_strbuf(&block.source ,&buf);

131 + block_source_from_buf(&block.source ,&buf);

132 ret = block_writer_init(&bw, BLOCK_TYPE_LOG, block.data, block_size,

133 header_off, hash_size(GIT_SHA1_FORMAT_ID));

134 check(!ret);

@@ -218,7 +218,7 @@ static void t_obj_block_read_write(void)

218 REFTABLE_CALLOC_ARRAY(block.data, block_size);

219 check(block.data != NULL);

220 block.len = block_size;

221 - block_source_from_strbuf(&block.source, &buf);

221 + block_source_from_buf(&block.source, &buf);

222 ret = block_writer_init(&bw, BLOCK_TYPE_OBJ, block.data, block_size,

223 header_off, hash_size(GIT_SHA1_FORMAT_ID));

224 check(!ret);

@@ -302,7 +302,7 @@ static void t_index_block_read_write(void)

302 REFTABLE_CALLOC_ARRAY(block.data, block_size);

303 check(block.data != NULL);

304 block.len = block_size;

305 - block_source_from_strbuf(&block.source, &buf);

305 + block_source_from_buf(&block.source, &buf);

306 ret = block_writer_init(&bw, BLOCK_TYPE_INDEX, block.data, block_size,

307 header_off, hash_size(GIT_SHA1_FORMAT_ID));

308 check(!ret);

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

+3 -3

@@ -35,7 +35,7 @@ merged_table_from_records(struct reftable_ref_record **refs,

36 for (size_t i = 0; i < n; i++) {

37 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]);

40 err = reftable_reader_new(&(*readers)[i], &(*source)[i],

41 "name");

@@ -293,7 +293,7 @@ merged_table_from_log_records(struct reftable_log_record **logs,

293

294 for (size_t i = 0; i < n; i++) {

295 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]);

297

298 err = reftable_reader_new(&(*readers)[i], &(*source)[i],

299 "name");

@@ -442,7 +442,7 @@ static void t_default_write_opts(void)

442 check(!err);

443 reftable_writer_free(w);

444

445 - block_source_from_strbuf(&source, &buf);

445 + block_source_from_buf(&source, &buf);

446

447 err = reftable_reader_new(&rd, &source, "filename");

448 check(!err);

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

+2 -2

@@ -20,7 +20,7 @@ static int t_reader_seek_once(void)

20 int ret;

22 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);

25 ret = reftable_reader_new(&reader, &source, "name");

26 check(!ret);

@@ -61,7 +61,7 @@ static int t_reader_reseek(void)

61 int ret;

63 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);

66 ret = reftable_reader_new(&reader, &source, "name");

67 check(!ret);

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

+12 -12

@@ -24,7 +24,7 @@ static void t_buffer(void)

24 int n;

25 uint8_t in[] = "hello";

26 reftable_buf_add(&buf, in, sizeof(in));

27 - block_source_from_strbuf(&source, &buf);

27 + block_source_from_buf(&source, &buf);

28 check_int(block_source_size(&source), ==, 6);

29 n = block_source_read_block(&source, &out, 0, sizeof(in));

30 check_int(n, ==, sizeof(in));

@@ -207,7 +207,7 @@ static void t_log_write_read(void)

207 reftable_writer_free(w);

208 w = NULL;

209

210 - block_source_from_strbuf(&source, &buf);

210 + block_source_from_buf(&source, &buf);

211

212 err = reftable_reader_new(&reader, &source, "file.log");

213 check(!err);

@@ -298,7 +298,7 @@ static void t_log_zlib_corruption(void)

298 /* corrupt the data. */

299 buf.buf[50] ^= 0x99;

300

301 - block_source_from_strbuf(&source, &buf);

301 + block_source_from_buf(&source, &buf);

302

303 err = reftable_reader_new(&reader, &source, "file.log");

304 check(!err);

@@ -328,7 +328,7 @@ static void t_table_read_write_sequential(void)

328

329 write_table(&names, &buf, N, 256, GIT_SHA1_FORMAT_ID);

330

331 - block_source_from_strbuf(&source, &buf);

331 + block_source_from_buf(&source, &buf);

332

333 err = reftable_reader_new(&reader, &source, "file.ref");

334 check(!err);

@@ -380,7 +380,7 @@ static void t_table_read_api(void)

380

381 write_table(&names, &buf, N, 256, GIT_SHA1_FORMAT_ID);

382

383 - block_source_from_strbuf(&source, &buf);

383 + block_source_from_buf(&source, &buf);

384

385 err = reftable_reader_new(&reader, &source, "file.ref");

386 check(!err);

@@ -416,7 +416,7 @@ static void t_table_read_write_seek(int index, int hash_id)

416

417 write_table(&names, &buf, N, 256, hash_id);

418

419 - block_source_from_strbuf(&source, &buf);

419 + block_source_from_buf(&source, &buf);

420

421 err = reftable_reader_new(&reader, &source, "file.ref");

422 check(!err);

@@ -538,7 +538,7 @@ static void t_table_refs_for(int indexed)

538 reftable_writer_free(w);

539 w = NULL;

540

541 - block_source_from_strbuf(&source, &buf);

541 + block_source_from_buf(&source, &buf);

542

543 err = reftable_reader_new(&reader, &source, "file.ref");

544 check(!err);

@@ -600,7 +600,7 @@ static void t_write_empty_table(void)

600

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

602

603 - block_source_from_strbuf(&source, &buf);

603 + block_source_from_buf(&source, &buf);

604

605 err = reftable_reader_new(&rd, &source, "filename");

606 check(!err);

@@ -806,7 +806,7 @@ static void t_write_multiple_indices(void)

806 check_int(stats->obj_stats.index_offset, >, 0);

807 check_int(stats->log_stats.index_offset, >, 0);

808

809 - block_source_from_strbuf(&source, &writer_buf);

809 + block_source_from_buf(&source, &writer_buf);

810 err = reftable_reader_new(&reader, &source, "filename");

811 check(!err);

812

@@ -863,7 +863,7 @@ static void t_write_multi_level_index(void)

863 stats = reftable_writer_stats(writer);

864 check_int(stats->ref_stats.max_index_level, ==, 2);

865

866 - block_source_from_strbuf(&source, &writer_buf);

866 + block_source_from_buf(&source, &writer_buf);

867 err = reftable_reader_new(&reader, &source, "filename");

868 check(!err);

869

@@ -889,7 +889,7 @@ static void t_corrupt_table_empty(void)

889 struct reftable_reader *reader;

890 int err;

891

892 - block_source_from_strbuf(&source, &buf);

892 + block_source_from_buf(&source, &buf);

893 err = reftable_reader_new(&reader, &source, "file.log");

894 check_int(err, ==, REFTABLE_FORMAT_ERROR);

895 }

@@ -903,7 +903,7 @@ static void t_corrupt_table(void)

903 int err;

904 reftable_buf_add(&buf, zeros, sizeof(zeros));

905

906 - block_source_from_strbuf(&source, &buf);

906 + block_source_from_buf(&source, &buf);

907 err = reftable_reader_new(&reader, &source, "file.log");

908 check_int(err, ==, REFTABLE_FORMAT_ERROR);

909