Skip to content

Commit 8d4f816

Browse files
Chandra Pratapgitster
authored andcommitted
t-reftable-merged: improve the const-correctness of helper functions
In t-reftable-merged.c, a number of helper functions used by the tests can be re-defined with parameters made 'const' which makes it easier to understand if they're read-only or not. Re-define these functions along these lines. Mentored-by: Patrick Steinhardt <[email protected]> Mentored-by: Christian Couder <[email protected]> Signed-off-by: Chandra Pratap <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c755c2f commit 8d4f816

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ license that can be found in the LICENSE file or at
1515
#include "reftable/reftable-merged.h"
1616
#include "reftable/reftable-writer.h"
1717

18-
static ssize_t strbuf_add_void(void *b, const void *data, size_t sz)
18+
static ssize_t strbuf_add_void(void *b, const void *data, const size_t sz)
1919
{
2020
strbuf_add(b, data, sz);
2121
return sz;
@@ -27,7 +27,7 @@ static int noop_flush(void *arg)
2727
}
2828

2929
static void write_test_table(struct strbuf *buf,
30-
struct reftable_ref_record refs[], size_t n)
30+
struct reftable_ref_record refs[], const size_t n)
3131
{
3232
uint64_t min = 0xffffffff;
3333
uint64_t max = 0;
@@ -62,9 +62,8 @@ static void write_test_table(struct strbuf *buf,
6262
reftable_writer_free(w);
6363
}
6464

65-
static void write_test_log_table(struct strbuf *buf,
66-
struct reftable_log_record logs[], size_t n,
67-
uint64_t update_index)
65+
static void write_test_log_table(struct strbuf *buf, struct reftable_log_record logs[],
66+
const size_t n, const uint64_t update_index)
6867
{
6968
int err;
7069

@@ -90,8 +89,8 @@ static void write_test_log_table(struct strbuf *buf,
9089
static struct reftable_merged_table *
9190
merged_table_from_records(struct reftable_ref_record **refs,
9291
struct reftable_block_source **source,
93-
struct reftable_reader ***readers, size_t *sizes,
94-
struct strbuf *buf, size_t n)
92+
struct reftable_reader ***readers, const size_t *sizes,
93+
struct strbuf *buf, const size_t n)
9594
{
9695
struct reftable_merged_table *mt = NULL;
9796
struct reftable_table *tabs;
@@ -116,7 +115,7 @@ merged_table_from_records(struct reftable_ref_record **refs,
116115
return mt;
117116
}
118117

119-
static void readers_destroy(struct reftable_reader **readers, size_t n)
118+
static void readers_destroy(struct reftable_reader **readers, const size_t n)
120119
{
121120
for (size_t i = 0; i < n; i++)
122121
reftable_reader_free(readers[i]);
@@ -267,8 +266,8 @@ static void t_merged_refs(void)
267266
static struct reftable_merged_table *
268267
merged_table_from_log_records(struct reftable_log_record **logs,
269268
struct reftable_block_source **source,
270-
struct reftable_reader ***readers, size_t *sizes,
271-
struct strbuf *buf, size_t n)
269+
struct reftable_reader ***readers, const size_t *sizes,
270+
struct strbuf *buf, const size_t n)
272271
{
273272
struct reftable_merged_table *mt = NULL;
274273
struct reftable_table *tabs;

0 commit comments

Comments
 (0)