Skip to content

Commit a021820

Browse files
pks-tgitster
authored andcommitted
reftable/reader: rename reftable_new_reader()
Rename the `reftable_new_reader()` function to `reftable_reader_new()` to match our coding guidelines. Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a52bac9 commit a021820

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

reftable/reader.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ void reader_close(struct reftable_reader *r)
637637
FREE_AND_NULL(r->name);
638638
}
639639

640-
int reftable_new_reader(struct reftable_reader **p,
640+
int reftable_reader_new(struct reftable_reader **p,
641641
struct reftable_block_source *src, char const *name)
642642
{
643643
struct reftable_reader *rd = reftable_calloc(1, sizeof(*rd));
@@ -786,7 +786,7 @@ int reftable_reader_print_blocks(const char *tablename)
786786
if (err < 0)
787787
goto done;
788788

789-
err = reftable_new_reader(&r, &src, tablename);
789+
err = reftable_reader_new(&r, &src, tablename);
790790
if (err < 0)
791791
goto done;
792792

reftable/readwrite_test.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ static void test_write_empty_table(void)
646646

647647
block_source_from_strbuf(&source, &buf);
648648

649-
err = reftable_new_reader(&rd, &source, "filename");
649+
err = reftable_reader_new(&rd, &source, "filename");
650650
EXPECT_ERR(err);
651651

652652
reftable_reader_init_ref_iterator(rd, &it);
@@ -850,7 +850,7 @@ static void test_write_multiple_indices(void)
850850
EXPECT(stats->log_stats.index_offset > 0);
851851

852852
block_source_from_strbuf(&source, &writer_buf);
853-
err = reftable_new_reader(&reader, &source, "filename");
853+
err = reftable_reader_new(&reader, &source, "filename");
854854
EXPECT_ERR(err);
855855

856856
/*
@@ -907,7 +907,7 @@ static void test_write_multi_level_index(void)
907907
EXPECT(stats->ref_stats.max_index_level == 2);
908908

909909
block_source_from_strbuf(&source, &writer_buf);
910-
err = reftable_new_reader(&reader, &source, "filename");
910+
err = reftable_reader_new(&reader, &source, "filename");
911911
EXPECT_ERR(err);
912912

913913
/*

reftable/reftable-reader.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
/* The reader struct is a handle to an open reftable file. */
2424
struct reftable_reader;
2525

26-
/* reftable_new_reader opens a reftable for reading. If successful,
26+
/* reftable_reader_new opens a reftable for reading. If successful,
2727
* returns 0 code and sets pp. The name is used for creating a
2828
* stack. Typically, it is the basename of the file. The block source
2929
* `src` is owned by the reader, and is closed on calling
3030
* reftable_reader_destroy(). On error, the block source `src` is
3131
* closed as well.
3232
*/
33-
int reftable_new_reader(struct reftable_reader **pp,
33+
int reftable_reader_new(struct reftable_reader **pp,
3434
struct reftable_block_source *src, const char *name);
3535

3636
/* Initialize a reftable iterator for reading refs. */

reftable/stack.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ static int reftable_stack_reload_once(struct reftable_stack *st,
258258
if (err < 0)
259259
goto done;
260260

261-
err = reftable_new_reader(&rd, &src, name);
261+
err = reftable_reader_new(&rd, &src, name);
262262
if (err < 0)
263263
goto done;
264264
}
@@ -1532,7 +1532,7 @@ static void remove_maybe_stale_table(struct reftable_stack *st, uint64_t max,
15321532
if (err < 0)
15331533
goto done;
15341534

1535-
err = reftable_new_reader(&rd, &src, name);
1535+
err = reftable_reader_new(&rd, &src, name);
15361536
if (err < 0)
15371537
goto done;
15381538

t/helper/test-reftable.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static int dump_reftable(const char *tablename)
139139
if (err < 0)
140140
goto done;
141141

142-
err = reftable_new_reader(&r, &src, tablename);
142+
err = reftable_reader_new(&r, &src, tablename);
143143
if (err < 0)
144144
goto done;
145145

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ merged_table_from_records(struct reftable_ref_record **refs,
102102
write_test_table(&buf[i], refs[i], sizes[i]);
103103
block_source_from_strbuf(&(*source)[i], &buf[i]);
104104

105-
err = reftable_new_reader(&(*readers)[i], &(*source)[i],
105+
err = reftable_reader_new(&(*readers)[i], &(*source)[i],
106106
"name");
107107
check(!err);
108108
}
@@ -277,7 +277,7 @@ merged_table_from_log_records(struct reftable_log_record **logs,
277277
write_test_log_table(&buf[i], logs[i], sizes[i], i + 1);
278278
block_source_from_strbuf(&(*source)[i], &buf[i]);
279279

280-
err = reftable_new_reader(&(*readers)[i], &(*source)[i],
280+
err = reftable_reader_new(&(*readers)[i], &(*source)[i],
281281
"name");
282282
check(!err);
283283
}
@@ -426,7 +426,7 @@ static void t_default_write_opts(void)
426426

427427
block_source_from_strbuf(&source, &buf);
428428

429-
err = reftable_new_reader(&rd, &source, "filename");
429+
err = reftable_reader_new(&rd, &source, "filename");
430430
check(!err);
431431

432432
hash_id = reftable_reader_hash_id(rd);

0 commit comments

Comments
 (0)