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>

diff --git a/reftable/merged.c b/reftable/merged.c
index 8d78b3da719fac9bfc44259d965d89b4b42e4b20..25d414ec415478c500bb58683d2f8b1ed305360a 100644 (file)
--- a/reftable/merged.c
+++ b/reftable/merged.c
@@ -192,7 +192,7 @@ static void iterator_from_merged_iter(struct reftable_iterator *it,
        it->ops = &merged_iter_vtable;
 }
 
-int reftable_new_merged_table(struct reftable_merged_table **dest,
+int reftable_merged_table_new(struct reftable_merged_table **dest,
                              struct reftable_table *stack, size_t n,
                              uint32_t hash_id)
 {

diff --git a/reftable/reftable-merged.h b/reftable/reftable-merged.h
index 4deb0ad22e10471b2290f30207004a6015aebb0e..72762483b9e4ac0f4c36aa7b7712ffe4bf918da9 100644 (file)
--- a/reftable/reftable-merged.h
+++ b/reftable/reftable-merged.h
@@ -29,10 +29,11 @@ struct reftable_merged_table;
 /* A generic reftable; see below. */
 struct reftable_table;
 
-/* reftable_new_merged_table creates a new merged table. It takes ownership of
-   the stack array.
-*/
-int reftable_new_merged_table(struct reftable_merged_table **dest,
+/*
+ * reftable_merged_table_new creates a new merged table. It takes ownership of
+ * the stack array.
+ */
+int reftable_merged_table_new(struct reftable_merged_table **dest,
                              struct reftable_table *stack, size_t n,
                              uint32_t hash_id);
 

diff --git a/reftable/stack.c b/reftable/stack.c
index 2071e428a80de2e744b46af931cc41a619a993c1..64c7fdf8c494feb1f70e1e54af51d69d4708fea5 100644 (file)
--- a/reftable/stack.c
+++ b/reftable/stack.c
@@ -272,7 +272,7 @@ static int reftable_stack_reload_once(struct reftable_stack *st,
        }
 
        /* success! */
-       err = reftable_new_merged_table(&new_merged, new_tables,
+       err = reftable_merged_table_new(&new_merged, new_tables,
                                        new_readers_len, st->opts.hash_id);
        if (err < 0)
                goto done;
@@ -924,7 +924,7 @@ static int stack_write_compact(struct reftable_stack *st,
        reftable_writer_set_limits(wr, st->readers[first]->min_update_index,
                                   st->readers[last]->max_update_index);
 
-       err = reftable_new_merged_table(&mt, subtabs, subtabs_len,
+       err = reftable_merged_table_new(&mt, subtabs, subtabs_len,
                                        st->opts.hash_id);
        if (err < 0) {
                reftable_free(subtabs);

diff --git a/t/unit-tests/t-reftable-merged.c b/t/unit-tests/t-reftable-merged.c
index b6263ee8b5a1f667e357a426a0b6e09a74748403..210603e8c78d3d2c32bbec866f4369a9f000780a 100644 (file)
--- a/t/unit-tests/t-reftable-merged.c
+++ b/t/unit-tests/t-reftable-merged.c
@@ -111,7 +111,7 @@ merged_table_from_records(struct reftable_ref_record **refs,
                reftable_table_from_reader(&tabs[i], (*readers)[i]);
        }
 
-       err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
+       err = reftable_merged_table_new(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
        check(!err);
        return mt;
 }
@@ -289,7 +289,7 @@ merged_table_from_log_records(struct reftable_log_record **logs,
                reftable_table_from_reader(&tabs[i], (*readers)[i]);
        }
 
-       err = reftable_new_merged_table(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
+       err = reftable_merged_table_new(&mt, tabs, n, GIT_SHA1_FORMAT_ID);
        check(!err);
        return mt;
 }
@@ -441,9 +441,9 @@ static void t_default_write_opts(void)
        check_int(hash_id, ==, GIT_SHA1_FORMAT_ID);
 
        reftable_table_from_reader(&tab[0], rd);
-       err = reftable_new_merged_table(&merged, tab, 1, GIT_SHA256_FORMAT_ID);
+       err = reftable_merged_table_new(&merged, tab, 1, GIT_SHA256_FORMAT_ID);
        check_int(err, ==, REFTABLE_FORMAT_ERROR);
-       err = reftable_new_merged_table(&merged, tab, 1, GIT_SHA1_FORMAT_ID);
+       err = reftable_merged_table_new(&merged, tab, 1, GIT_SHA1_FORMAT_ID);
        check(!err);
 
        reftable_reader_free(rd);