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 <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/reftable/reader.c b/reftable/reader.c
index 082cf00b60658397ba278fc75d92fb51e1254c76..ea4fdea90b675de0d84b6404bf88dd304cfdfc03 100644 (file)
--- a/reftable/reader.c
+++ b/reftable/reader.c
@@ -637,7 +637,7 @@ void reader_close(struct reftable_reader *r)
        FREE_AND_NULL(r->name);
 }
 
-int reftable_new_reader(struct reftable_reader **p,
+int reftable_reader_new(struct reftable_reader **p,
                        struct reftable_block_source *src, char const *name)
 {
        struct reftable_reader *rd = reftable_calloc(1, sizeof(*rd));
@@ -786,7 +786,7 @@ int reftable_reader_print_blocks(const char *tablename)
        if (err < 0)
                goto done;
 
-       err = reftable_new_reader(&r, &src, tablename);
+       err = reftable_reader_new(&r, &src, tablename);
        if (err < 0)
                goto done;
 

diff --git a/reftable/readwrite_test.c b/reftable/readwrite_test.c
index f411abfe9cb7367d94d84f23a84d4ad7912e50cd..101cdb5cd663df62e358ff2fbce21501d9c45eae 100644 (file)
--- a/reftable/readwrite_test.c
+++ b/reftable/readwrite_test.c
@@ -646,7 +646,7 @@ static void test_write_empty_table(void)
 
        block_source_from_strbuf(&source, &buf);
 
-       err = reftable_new_reader(&rd, &source, "filename");
+       err = reftable_reader_new(&rd, &source, "filename");
        EXPECT_ERR(err);
 
        reftable_reader_init_ref_iterator(rd, &it);
@@ -850,7 +850,7 @@ static void test_write_multiple_indices(void)
        EXPECT(stats->log_stats.index_offset > 0);
 
        block_source_from_strbuf(&source, &writer_buf);
-       err = reftable_new_reader(&reader, &source, "filename");
+       err = reftable_reader_new(&reader, &source, "filename");
        EXPECT_ERR(err);
 
        /*
@@ -907,7 +907,7 @@ static void test_write_multi_level_index(void)
        EXPECT(stats->ref_stats.max_index_level == 2);
 
        block_source_from_strbuf(&source, &writer_buf);
-       err = reftable_new_reader(&reader, &source, "filename");
+       err = reftable_reader_new(&reader, &source, "filename");
        EXPECT_ERR(err);
 
        /*

diff --git a/reftable/reftable-reader.h b/reftable/reftable-reader.h
index 69621c5b0fc7f9e753a72bae6821ee770d1323f9..8a05c846858a1b7f3dde6d5f02f52470bcbf4cbe 100644 (file)
--- a/reftable/reftable-reader.h
+++ b/reftable/reftable-reader.h
@@ -23,14 +23,14 @@
 /* The reader struct is a handle to an open reftable file. */
 struct reftable_reader;
 
-/* reftable_new_reader opens a reftable for reading. If successful,
+/* reftable_reader_new opens a reftable for reading. If successful,
  * returns 0 code and sets pp. The name is used for creating a
  * stack. Typically, it is the basename of the file. The block source
  * `src` is owned by the reader, and is closed on calling
  * reftable_reader_destroy(). On error, the block source `src` is
  * closed as well.
  */
-int reftable_new_reader(struct reftable_reader **pp,
+int reftable_reader_new(struct reftable_reader **pp,
                        struct reftable_block_source *src, const char *name);
 
 /* Initialize a reftable iterator for reading refs. */

diff --git a/reftable/stack.c b/reftable/stack.c
index 891ea971b722426362e19bcbb9f81e74d29eb569..c72435b05967b852e865061c88e2cddd8418a013 100644 (file)
--- a/reftable/stack.c
+++ b/reftable/stack.c
@@ -258,7 +258,7 @@ static int reftable_stack_reload_once(struct reftable_stack *st,
                        if (err < 0)
                                goto done;
 
-                       err = reftable_new_reader(&rd, &src, name);
+                       err = reftable_reader_new(&rd, &src, name);
                        if (err < 0)
                                goto done;
                }
@@ -1532,7 +1532,7 @@ static void remove_maybe_stale_table(struct reftable_stack *st, uint64_t max,
        if (err < 0)
                goto done;
 
-       err = reftable_new_reader(&rd, &src, name);
+       err = reftable_reader_new(&rd, &src, name);
        if (err < 0)
                goto done;
 

diff --git a/t/helper/test-reftable.c b/t/helper/test-reftable.c
index c1942156b50d46fb242bf2aaf56e626f8641dba6..87c2f42aaed7903411cf121163819a16686f776f 100644 (file)
--- a/t/helper/test-reftable.c
+++ b/t/helper/test-reftable.c
@@ -139,7 +139,7 @@ static int dump_reftable(const char *tablename)
        if (err < 0)
                goto done;
 
-       err = reftable_new_reader(&r, &src, tablename);
+       err = reftable_reader_new(&r, &src, tablename);
        if (err < 0)
                goto done;
 

diff --git a/t/unit-tests/t-reftable-merged.c b/t/unit-tests/t-reftable-merged.c
index 93345c6c8bec1cd2d0df8a13bb02a9a44846e0ad..8f51aca1b625abac987cc784a32ed22f262d90ba 100644 (file)
--- a/t/unit-tests/t-reftable-merged.c
+++ b/t/unit-tests/t-reftable-merged.c
@@ -102,7 +102,7 @@ merged_table_from_records(struct reftable_ref_record **refs,
                write_test_table(&buf[i], refs[i], sizes[i]);
                block_source_from_strbuf(&(*source)[i], &buf[i]);
 
-               err = reftable_new_reader(&(*readers)[i], &(*source)[i],
+               err = reftable_reader_new(&(*readers)[i], &(*source)[i],
                                          "name");
                check(!err);
        }
@@ -277,7 +277,7 @@ merged_table_from_log_records(struct reftable_log_record **logs,
                write_test_log_table(&buf[i], logs[i], sizes[i], i + 1);
                block_source_from_strbuf(&(*source)[i], &buf[i]);
 
-               err = reftable_new_reader(&(*readers)[i], &(*source)[i],
+               err = reftable_reader_new(&(*readers)[i], &(*source)[i],
                                          "name");
                check(!err);
        }
@@ -426,7 +426,7 @@ static void t_default_write_opts(void)
 
        block_source_from_strbuf(&source, &buf);
 
-       err = reftable_new_reader(&rd, &source, "filename");
+       err = reftable_reader_new(&rd, &source, "filename");
        check(!err);
 
        hash_id = reftable_reader_hash_id(rd);