ALLOC_GROW: avoid -Wsign-compare warnings

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index c753e9237a8d5981a17e872db33d5326bd8d7eab..b40cdfe64ade3a280aecdf86d270716fa5a97c97 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2556,8 +2556,8 @@ struct in_pack_object {
 };
 
 struct in_pack {
 };
 
 struct in_pack {

-       int alloc;
-       int nr;
+       unsigned int alloc;
+       unsigned int nr;

        struct in_pack_object *array;
 };
 
        struct in_pack_object *array;
 };
 

diff --git a/config.c b/config.c
index acebc85d81372f15d3d490d84dc751f59bde26c4..149bee1c714dc991242d26fb1981b1500ad60246 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2159,7 +2159,7 @@ static struct {
        size_t *offset;
        unsigned int offset_alloc;
        enum { START, SECTION_SEEN, SECTION_END_SEEN, KEY_SEEN } state;
        size_t *offset;
        unsigned int offset_alloc;
        enum { START, SECTION_SEEN, SECTION_END_SEEN, KEY_SEEN } state;

-       int seen;
+       unsigned int seen;

 } store;
 
 static int matches(const char *key, const char *value)
 } store;
 
 static int matches(const char *key, const char *value)

diff --git a/diff.c b/diff.c
index 9c382580306e340ed6333f96bc4919c4c507a7b9..c7cf683e0be05941b3f8beb5184a08c785b174fd 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -825,7 +825,7 @@ static void emit_rewrite_diff(const char *name_a,
 
 struct diff_words_buffer {
        mmfile_t text;
 
 struct diff_words_buffer {
        mmfile_t text;

-       long alloc;
+       unsigned long alloc;

        struct diff_words_orig {
                const char *begin, *end;
        } *orig;
        struct diff_words_orig {
                const char *begin, *end;
        } *orig;

diff --git a/line-log.c b/line-log.c
index ab0709f9aecaacdfaf44aa31c88873b4ab5d8278..545ad0f28bce0ac0f92a31019b92f7ef8a668356 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -90,7 +90,7 @@ static int range_cmp(const void *_r, const void *_s)
  */
 static void range_set_check_invariants(struct range_set *rs)
 {
  */
 static void range_set_check_invariants(struct range_set *rs)
 {

-       int i;
+       unsigned int i;

 
        if (!rs)
                return;
 
        if (!rs)
                return;


@@ -110,8 +110,8 @@ static void range_set_check_invariants(struct range_set *rs)
  */
 void sort_and_merge_range_set(struct range_set *rs)
 {
  */
 void sort_and_merge_range_set(struct range_set *rs)
 {

-       int i;
-       int o = 0; /* output cursor */
+       unsigned int i;
+       unsigned int o = 0; /* output cursor */

 
        QSORT(rs->ranges, rs->nr, range_cmp);
 
 
        QSORT(rs->ranges, rs->nr, range_cmp);
 


@@ -144,7 +144,7 @@ void sort_and_merge_range_set(struct range_set *rs)
 static void range_set_union(struct range_set *out,
                             struct range_set *a, struct range_set *b)
 {
 static void range_set_union(struct range_set *out,
                             struct range_set *a, struct range_set *b)
 {

-       int i = 0, j = 0;
+       unsigned int i = 0, j = 0;

        struct range *ra = a->ranges;
        struct range *rb = b->ranges;
        /* cannot make an alias of out->ranges: it may change during grow */
        struct range *ra = a->ranges;
        struct range *rb = b->ranges;
        /* cannot make an alias of out->ranges: it may change during grow */


@@ -186,7 +186,7 @@ static void range_set_union(struct range_set *out,
 static void range_set_difference(struct range_set *out,
                                  struct range_set *a, struct range_set *b)
 {
 static void range_set_difference(struct range_set *out,
                                  struct range_set *a, struct range_set *b)
 {

-       int i, j =  0;
+       unsigned int i, j =  0;

        for (i = 0; i < a->nr; i++) {
                long start = a->ranges[i].start;
                long end = a->ranges[i].end;
        for (i = 0; i < a->nr; i++) {
                long start = a->ranges[i].start;
                long end = a->ranges[i].end;


@@ -397,7 +397,7 @@ static void diff_ranges_filter_touched(struct diff_ranges *out,
                                       struct diff_ranges *diff,
                                       struct range_set *rs)
 {
                                       struct diff_ranges *diff,
                                       struct range_set *rs)
 {

-       int i, j = 0;
+       unsigned int i, j = 0;

 
        assert(out->target.nr == 0);
 
 
        assert(out->target.nr == 0);
 


@@ -426,7 +426,7 @@ static void range_set_shift_diff(struct range_set *out,
                                 struct range_set *rs,
                                 struct diff_ranges *diff)
 {
                                 struct range_set *rs,
                                 struct diff_ranges *diff)
 {

-       int i, j = 0;
+       unsigned int i, j = 0;

        long offset = 0;
        struct range *src = rs->ranges;
        struct range *target = diff->target.ranges;
        long offset = 0;
        struct range *src = rs->ranges;
        struct range *target = diff->target.ranges;


@@ -873,7 +873,7 @@ static char *output_prefix(struct diff_options *opt)
 
 static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *range)
 {
 
 static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *range)
 {

-       int i, j = 0;
+       unsigned int i, j = 0;

        long p_lines, t_lines;
        unsigned long *p_ends = NULL, *t_ends = NULL;
        struct diff_filepair *pair = range->pair;
        long p_lines, t_lines;
        unsigned long *p_ends = NULL, *t_ends = NULL;
        struct diff_filepair *pair = range->pair;


@@ -906,7 +906,7 @@ static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *rang
                long t_start = range->ranges.ranges[i].start;
                long t_end = range->ranges.ranges[i].end;
                long t_cur = t_start;
                long t_start = range->ranges.ranges[i].start;
                long t_end = range->ranges.ranges[i].end;
                long t_cur = t_start;

-               int j_last;
+               unsigned int j_last;

 
                while (j < diff->target.nr && diff->target.ranges[j].end < t_start)
                        j++;
 
                while (j < diff->target.nr && diff->target.ranges[j].end < t_start)
                        j++;

diff --git a/line-log.h b/line-log.h
index 7a5c24e2df40c09274077928574bc91349d475d1..e2a5ee7c6d077df353a20d2d55d8b4fc24642bc3 100644 (file)
--- a/line-log.h
+++ b/line-log.h
@@ -14,7 +14,7 @@ struct range {
 
 /* A set of ranges.  The ranges must always be disjoint and sorted. */
 struct range_set {
 
 /* A set of ranges.  The ranges must always be disjoint and sorted. */
 struct range_set {

-       int alloc, nr;
+       unsigned int alloc, nr;

        struct range *ranges;
 };
 
        struct range *ranges;
 };
 

diff --git a/revision.c b/revision.c
index f032ab2e5c5c73c691338cdaf99d5b3b3d16b674..7da0907c85a419a3f055a95f0b3ae0a0f070c8e2 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1103,7 +1103,7 @@ static void add_rev_cmdline(struct rev_info *revs,
                            unsigned flags)
 {
        struct rev_cmdline_info *info = &revs->cmdline;
                            unsigned flags)
 {
        struct rev_cmdline_info *info = &revs->cmdline;

-       int nr = info->nr;
+       unsigned int nr = info->nr;

 
        ALLOC_GROW(info->rev, nr + 1, info->alloc);
        info->rev[nr].item = item;
 
        ALLOC_GROW(info->rev, nr + 1, info->alloc);
        info->rev[nr].item = item;

diff --git a/tree-walk.c b/tree-walk.c
index 6a42e402b00a3da90a008adf6e4c68dc8c45e516..d459feda2390735fb4e3a26e00444946a6b31353 100644 (file)
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -581,12 +581,11 @@ enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_s
        int retval = MISSING_OBJECT;
        struct dir_state *parents = NULL;
        size_t parents_alloc = 0;
        int retval = MISSING_OBJECT;
        struct dir_state *parents = NULL;
        size_t parents_alloc = 0;

-       ssize_t parents_nr = 0;
+       size_t i, parents_nr = 0;

        unsigned char current_tree_sha1[20];
        struct strbuf namebuf = STRBUF_INIT;
        struct tree_desc t;
        int follows_remaining = GET_TREE_ENTRY_FOLLOW_SYMLINKS_MAX_LINKS;
        unsigned char current_tree_sha1[20];
        struct strbuf namebuf = STRBUF_INIT;
        struct tree_desc t;
        int follows_remaining = GET_TREE_ENTRY_FOLLOW_SYMLINKS_MAX_LINKS;

-       int i;

 
        init_tree_desc(&t, NULL, 0UL);
        strbuf_addstr(&namebuf, name);
 
        init_tree_desc(&t, NULL, 0UL);
        strbuf_addstr(&namebuf, name);