reftable/stack: use `size_t` to track stack length

While the stack length is already stored as `size_t`, we frequently use
`int`s to refer to those stacks throughout the reftable library. Convert
those cases to use `size_t` instead to make things consistent.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/reftable/basics.c b/reftable/basics.c
index af9004cec24db5de63ba6c0120ebf4578f74b055..0785aff941bdc2d84181651a48f35cfaaefaede9 100644 (file)
--- a/reftable/basics.c
+++ b/reftable/basics.c
@@ -64,12 +64,11 @@ void free_names(char **a)
        reftable_free(a);
 }
 
-int names_length(char **names)
+size_t names_length(char **names)
 {
        char **p = names;
-       for (; *p; p++) {
-               /* empty */
-       }
+       while (*p)
+               p++;
        return p - names;
 }
 

diff --git a/reftable/basics.h b/reftable/basics.h
index 4c3ac963a35204fbb3d2d5aab6589fe6120646ab..91f3533efee501faf3e461f7206dbc7a964da98e 100644 (file)
--- a/reftable/basics.h
+++ b/reftable/basics.h
@@ -44,7 +44,7 @@ void parse_names(char *buf, int size, char ***namesp);
 int names_equal(char **a, char **b);
 
 /* returns the array size of a NULL-terminated array of strings. */
-int names_length(char **names);
+size_t names_length(char **names);
 
 /* Allocation routines; they invoke the functions set through
  * reftable_set_alloc() */

diff --git a/reftable/merged.c b/reftable/merged.c
index 2031fd51b4426f26da14a68567d8f24b9c7a2e58..e2c6253324f256728cf6d7b33aea0bfd3d40d906 100644 (file)
--- a/reftable/merged.c
+++ b/reftable/merged.c
@@ -45,11 +45,10 @@ static int merged_iter_init(struct merged_iter *mi)
 static void merged_iter_close(void *p)
 {
        struct merged_iter *mi = p;
-       int i = 0;
+
        merged_iter_pqueue_release(&mi->pq);
-       for (i = 0; i < mi->stack_len; i++) {
+       for (size_t i = 0; i < mi->stack_len; i++)
                reftable_iterator_destroy(&mi->stack[i]);
-       }
        reftable_free(mi->stack);
        strbuf_release(&mi->key);
        strbuf_release(&mi->entry_key);
@@ -168,14 +167,14 @@ static void iterator_from_merged_iter(struct reftable_iterator *it,
 }
 
 int reftable_new_merged_table(struct reftable_merged_table **dest,
-                             struct reftable_table *stack, int n,
+                             struct reftable_table *stack, size_t n,
                              uint32_t hash_id)
 {
        struct reftable_merged_table *m = NULL;
        uint64_t last_max = 0;
        uint64_t first_min = 0;
-       int i = 0;
-       for (i = 0; i < n; i++) {
+
+       for (size_t i = 0; i < n; i++) {
                uint64_t min = reftable_table_min_update_index(&stack[i]);
                uint64_t max = reftable_table_max_update_index(&stack[i]);
 

diff --git a/reftable/merged_test.c b/reftable/merged_test.c
index e233a9d581cff05cf91836af5c653dd4a3f3dbfc..442917cc83595eaec56f15891a68ea5af273d78a 100644 (file)
--- a/reftable/merged_test.c
+++ b/reftable/merged_test.c
@@ -88,18 +88,17 @@ static struct reftable_merged_table *
 merged_table_from_records(struct reftable_ref_record **refs,
                          struct reftable_block_source **source,
                          struct reftable_reader ***readers, int *sizes,
-                         struct strbuf *buf, int n)
+                         struct strbuf *buf, size_t n)
 {
-       int i = 0;
        struct reftable_merged_table *mt = NULL;
-       int err;
        struct reftable_table *tabs;
+       int err;
 
        REFTABLE_CALLOC_ARRAY(tabs, n);
        REFTABLE_CALLOC_ARRAY(*readers, n);
        REFTABLE_CALLOC_ARRAY(*source, n);
 
-       for (i = 0; i < n; i++) {
+       for (size_t i = 0; i < n; i++) {
                write_test_table(&buf[i], refs[i], sizes[i]);
                block_source_from_strbuf(&(*source)[i], &buf[i]);
 
@@ -263,18 +262,17 @@ static struct reftable_merged_table *
 merged_table_from_log_records(struct reftable_log_record **logs,
                              struct reftable_block_source **source,
                              struct reftable_reader ***readers, int *sizes,
-                             struct strbuf *buf, int n)
+                             struct strbuf *buf, size_t n)
 {
-       int i = 0;
        struct reftable_merged_table *mt = NULL;
-       int err;
        struct reftable_table *tabs;
+       int err;
 
        REFTABLE_CALLOC_ARRAY(tabs, n);
        REFTABLE_CALLOC_ARRAY(*readers, n);
        REFTABLE_CALLOC_ARRAY(*source, n);
 
-       for (i = 0; i < n; i++) {
+       for (size_t i = 0; i < n; i++) {
                write_test_log_table(&buf[i], logs[i], sizes[i], i + 1);
                block_source_from_strbuf(&(*source)[i], &buf[i]);
 

diff --git a/reftable/reftable-merged.h b/reftable/reftable-merged.h
index 1a6d16915ab453b480f0ca657448034a11ddf6be..c91a2d83a2b8a956e4b2d4999b4548ed1860269b 100644 (file)
--- a/reftable/reftable-merged.h
+++ b/reftable/reftable-merged.h
@@ -33,7 +33,7 @@ struct reftable_table;
    the stack array.
 */
 int reftable_new_merged_table(struct reftable_merged_table **dest,
-                             struct reftable_table *stack, int n,
+                             struct reftable_table *stack, size_t n,
                              uint32_t hash_id);
 
 /* returns an iterator positioned just before 'name' */

diff --git a/reftable/stack.c b/reftable/stack.c
index a86481a9a6d5145addb58f16c62bc32c0e384577..bb684a3dc1643e07a0af2c1d0f989402a96f8ade 100644 (file)
--- a/reftable/stack.c
+++ b/reftable/stack.c
@@ -202,18 +202,18 @@ static struct reftable_reader **stack_copy_readers(struct reftable_stack *st,
 static int reftable_stack_reload_once(struct reftable_stack *st, char **names,
                                      int reuse_open)
 {
-       int cur_len = !st->merged ? 0 : st->merged->stack_len;
+       size_t cur_len = !st->merged ? 0 : st->merged->stack_len;
        struct reftable_reader **cur = stack_copy_readers(st, cur_len);
-       int err = 0;
-       int names_len = names_length(names);
+       size_t names_len = names_length(names);
        struct reftable_reader **new_readers =
                reftable_calloc(names_len, sizeof(*new_readers));
        struct reftable_table *new_tables =
                reftable_calloc(names_len, sizeof(*new_tables));
-       int new_readers_len = 0;
+       size_t new_readers_len = 0;
        struct reftable_merged_table *new_merged = NULL;
        struct strbuf table_path = STRBUF_INIT;
-       int i;
+       int err = 0;
+       size_t i;
 
        while (*names) {
                struct reftable_reader *rd = NULL;
@@ -221,11 +221,10 @@ static int reftable_stack_reload_once(struct reftable_stack *st, char **names,
 
                /* this is linear; we assume compaction keeps the number of
                   tables under control so this is not quadratic. */
-               int j = 0;
-               for (j = 0; reuse_open && j < cur_len; j++) {
-                       if (cur[j] && 0 == strcmp(cur[j]->name, name)) {
-                               rd = cur[j];
-                               cur[j] = NULL;
+               for (i = 0; reuse_open && i < cur_len; i++) {
+                       if (cur[i] && 0 == strcmp(cur[i]->name, name)) {
+                               rd = cur[i];
+                               cur[i] = NULL;
                                break;
                        }
                }
@@ -870,7 +869,7 @@ static int stack_write_compact(struct reftable_stack *st,
                               size_t first, size_t last,
                               struct reftable_log_expiry_config *config)
 {
-       int subtabs_len = last - first + 1;
+       size_t subtabs_len = last - first + 1;
        struct reftable_table *subtabs = reftable_calloc(
                last - first + 1, sizeof(*subtabs));
        struct reftable_merged_table *mt = NULL;