reftable/merged: rename `reftable_new_merged_table()`
Rename `reftable_new_merged_table()` to `reftable_merged_table_new()` such that the name matches our coding style. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Aug 22, 2024 at 08:34 UTC
6631ed3ce706a82ee43aa70afb38a236bf69d645
4 files changed
+12
-11
reftable/merged.c
+1
-1
@@ -192,7 +192,7 @@ static void iterator_from_merged_iter(struct reftable_iterator *it,
192
it->ops = &merged_iter_vtable;
193
}
194
195
-int reftable_new_merged_table(struct reftable_merged_table **dest,
195
+int reftable_merged_table_new(struct reftable_merged_table **dest,
196
struct reftable_table *stack, size_t n,
197
uint32_t hash_id)
198
{
reftable/reftable-merged.h
+5
-4
@@ -29,10 +29,11 @@ struct reftable_merged_table;
29
/* A generic reftable; see below. */
30
struct reftable_table;
31
32
-/* reftable_new_merged_table creates a new merged table. It takes ownership of
33
- the stack array.
34
-*/
35
-int reftable_new_merged_table(struct reftable_merged_table **dest,
32
+/*
33
+ * reftable_merged_table_new creates a new merged table. It takes ownership of
34
+ * the stack array.
35
+ */
36
+int reftable_merged_table_new(struct reftable_merged_table **dest,
37
struct reftable_table *stack, size_t n,
38
uint32_t hash_id);
39
reftable/stack.c
+2
-2
@@ -272,7 +272,7 @@ static int reftable_stack_reload_once(struct reftable_stack *st,
272
}
273
274
/* success! */
275
- err = reftable_new_merged_table(&new_merged, new_tables,
275
+ err = reftable_merged_table_new(&new_merged, new_tables,
276
new_readers_len, st->opts.hash_id);
277
if (err < 0)
278
goto done;
@@ -924,7 +924,7 @@ static int stack_write_compact(struct reftable_stack *st,
924
reftable_writer_set_limits(wr, st->readers[first]->min_update_index,
925
st->readers[last]->max_update_index);
926
927
- err = reftable_new_merged_table(&mt, subtabs, subtabs_len,
927
+ err = reftable_merged_table_new(&mt, subtabs, subtabs_len,
928
st->opts.hash_id);
929
if (err < 0) {
930
reftable_free(subtabs);
t/unit-tests/t-reftable-merged.c
+4
-4
@@ -111,7 +111,7 @@ merged_table_from_records(struct reftable_ref_record **refs,
111
reftable_table_from_reader(&tabs[i], (*readers)[i]);
112
}
113
114
- err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
114
+ err = reftable_merged_table_new(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
115
check(!err);
116
return mt;
117
}
@@ -289,7 +289,7 @@ merged_table_from_log_records(struct reftable_log_record **logs,
289
reftable_table_from_reader(&tabs[i], (*readers)[i]);
290
}
291
292
- err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
292
+ err = reftable_merged_table_new(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
293
check(!err);
294
return mt;
295
}
@@ -441,9 +441,9 @@ static void t_default_write_opts(void)
441
check_int(hash_id, ==, GIT_SHA1_FORMAT_ID);
442
443
reftable_table_from_reader(&tab[0], rd);
444
- err = reftable_new_merged_table(&merged, tab, 1, GIT_SHA256_FORMAT_ID);
444
+ err = reftable_merged_table_new(&merged, tab, 1, GIT_SHA256_FORMAT_ID);
445
check_int(err, ==, REFTABLE_FORMAT_ERROR);
446
- err = reftable_new_merged_table(&merged, tab, 1, GIT_SHA1_FORMAT_ID);
446
+ err = reftable_merged_table_new(&merged, tab, 1, GIT_SHA1_FORMAT_ID);
447
check(!err);
448
449
reftable_reader_free(rd);