reftable: address trivial -Wsign-compare warnings

Address the last couple of trivial -Wsign-compare warnings in the
reftable library and remove the DISABLE_SIGN_COMPARE_WARNINGS macro that
we have in "reftable/system.h".

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

diff --git a/reftable/record.c b/reftable/record.c
index f7766a32efe02ffe5981247dd2f3806108c61965..8919df8a4d3e3d6db2bcca47507d11d01d863cc5 100644 (file)
--- a/reftable/record.c
+++ b/reftable/record.c
@@ -126,7 +126,7 @@ static int decode_string(struct reftable_buf *dest, struct string_view in)
 static int encode_string(const char *str, struct string_view s)
 {
        struct string_view start = s;
-       int l = strlen(str);
+       size_t l = strlen(str);
        int n = put_var_int(&s, l);
        if (n < 0)
                return -1;
@@ -565,7 +565,6 @@ static int reftable_obj_record_decode(void *rec, struct reftable_buf key,
        uint64_t count = val_type;
        int n = 0;
        uint64_t last;
-       int j;
 
        reftable_obj_record_release(r);
 
@@ -600,8 +599,7 @@ static int reftable_obj_record_decode(void *rec, struct reftable_buf key,
        string_view_consume(&in, n);
 
        last = r->offsets[0];
-       j = 1;
-       while (j < count) {
+       for (uint64_t j = 1; j < count; j++) {
                uint64_t delta = 0;
                int n = get_var_int(&delta, &in);
                if (n < 0) {
@@ -610,7 +608,6 @@ static int reftable_obj_record_decode(void *rec, struct reftable_buf key,
                string_view_consume(&in, n);
 
                last = r->offsets[j] = (delta + last);
-               j++;
        }
        return start.len - in.len;
 }

diff --git a/reftable/stack.c b/reftable/stack.c
index 531660a49f0948c33041831ee0d740feacb22b2f..5c0d6273a73339501599b8276cba463c4b77ca09 100644 (file)
--- a/reftable/stack.c
+++ b/reftable/stack.c
@@ -220,9 +220,9 @@ void reftable_stack_destroy(struct reftable_stack *st)
        }
 
        if (st->readers) {
-               int i = 0;
                struct reftable_buf filename = REFTABLE_BUF_INIT;
-               for (i = 0; i < st->readers_len; i++) {
+
+               for (size_t i = 0; i < st->readers_len; i++) {
                        const char *name = reader_name(st->readers[i]);
                        int try_unlinking = 1;
 
@@ -238,6 +238,7 @@ void reftable_stack_destroy(struct reftable_stack *st)
                                unlink(filename.buf);
                        }
                }
+
                reftable_buf_release(&filename);
                st->readers_len = 0;
                REFTABLE_FREE_AND_NULL(st->readers);
@@ -568,7 +569,6 @@ static int stack_uptodate(struct reftable_stack *st)
 {
        char **names = NULL;
        int err;
-       int i = 0;
 
        /*
         * When we have cached stat information available then we use it to
@@ -608,7 +608,7 @@ static int stack_uptodate(struct reftable_stack *st)
        if (err < 0)
                return err;
 
-       for (i = 0; i < st->readers_len; i++) {
+       for (size_t i = 0; i < st->readers_len; i++) {
                if (!names[i]) {
                        err = 1;
                        goto done;
@@ -1767,14 +1767,12 @@ static int reftable_stack_clean_locked(struct reftable_stack *st)
        }
 
        while ((d = readdir(dir))) {
-               int i = 0;
                int found = 0;
                if (!is_table_name(d->d_name))
                        continue;
 
-               for (i = 0; !found && i < st->readers_len; i++) {
+               for (size_t i = 0; !found && i < st->readers_len; i++)
                        found = !strcmp(reader_name(st->readers[i]), d->d_name);
-               }
                if (found)
                        continue;
 

diff --git a/reftable/system.h b/reftable/system.h
index 5274eca1d05b18bdadef9f991ff79fa83f3363e4..7d5f803eeb1bdeaec475c95c85e5966859542108 100644 (file)
--- a/reftable/system.h
+++ b/reftable/system.h
@@ -11,8 +11,6 @@ https://developers.google.com/open-source/licenses/bsd
 
 /* This header glues the reftable library to the rest of Git */
 
-#define DISABLE_SIGN_COMPARE_WARNINGS
-
 #include "git-compat-util.h"
 
 /*