ALLOC_GROW: avoid -Wsign-compare warnings
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones committed
Sep 21, 2017 at 17:49 UTC
071bcaab6480dea80a47f574f61dc2cd9518e7dc
7 files changed
+16
-17
builtin/pack-objects.c
+2
-2
@@ -2556,8 +2556,8 @@ struct in_pack_object {
2556
};
2557
2558
struct in_pack {
2559
- int alloc;
2560
- int nr;
2559
+ unsigned int alloc;
2560
+ unsigned int nr;
2561
struct in_pack_object *array;
2562
};
2563
config.c
+1
-1
@@ -2159,7 +2159,7 @@ static struct {
2159
size_t *offset;
2160
unsigned int offset_alloc;
2161
enum { START, SECTION_SEEN, SECTION_END_SEEN, KEY_SEEN } state;
2162
- int seen;
2162
+ unsigned int seen;
2163
} store;
2164
2165
static int matches(const char *key, const char *value)
diff.c
+1
-1
@@ -825,7 +825,7 @@ static void emit_rewrite_diff(const char *name_a,
825
826
struct diff_words_buffer {
827
mmfile_t text;
828
- long alloc;
828
+ unsigned long alloc;
829
struct diff_words_orig {
830
const char *begin, *end;
831
} *orig;
line-log.c
+9
-9
@@ -90,7 +90,7 @@ static int range_cmp(const void *_r, const void *_s)
90
*/
91
static void range_set_check_invariants(struct range_set *rs)
92
{
93
- int i;
93
+ unsigned int i;
94
95
if (!rs)
96
return;
@@ -110,8 +110,8 @@ static void range_set_check_invariants(struct range_set *rs)
110
*/
111
void sort_and_merge_range_set(struct range_set *rs)
112
{
113
- int i;
114
- int o = 0; /* output cursor */
113
+ unsigned int i;
114
+ unsigned int o = 0; /* output cursor */
115
116
QSORT(rs->ranges, rs->nr, range_cmp);
117
@@ -144,7 +144,7 @@ void sort_and_merge_range_set(struct range_set *rs)
144
static void range_set_union(struct range_set *out,
145
struct range_set *a, struct range_set *b)
146
{
147
- int i = 0, j = 0;
147
+ unsigned int i = 0, j = 0;
148
struct range *ra = a->ranges;
149
struct range *rb = b->ranges;
150
/* 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,
186
static void range_set_difference(struct range_set *out,
187
struct range_set *a, struct range_set *b)
188
{
189
- int i, j = 0;
189
+ unsigned int i, j = 0;
190
for (i = 0; i < a->nr; i++) {
191
long start = a->ranges[i].start;
192
long end = a->ranges[i].end;
@@ -397,7 +397,7 @@ static void diff_ranges_filter_touched(struct diff_ranges *out,
397
struct diff_ranges *diff,
398
struct range_set *rs)
399
{
400
- int i, j = 0;
400
+ unsigned int i, j = 0;
401
402
assert(out->target.nr == 0);
403
@@ -426,7 +426,7 @@ static void range_set_shift_diff(struct range_set *out,
426
struct range_set *rs,
427
struct diff_ranges *diff)
428
{
429
- int i, j = 0;
429
+ unsigned int i, j = 0;
430
long offset = 0;
431
struct range *src = rs->ranges;
432
struct range *target = diff->target.ranges;
@@ -873,7 +873,7 @@ static char *output_prefix(struct diff_options *opt)
873
874
static void dump_diff_hacky_one(struct rev_info *rev, struct line_log_data *range)
875
{
876
- int i, j = 0;
876
+ unsigned int i, j = 0;
877
long p_lines, t_lines;
878
unsigned long *p_ends = NULL, *t_ends = NULL;
879
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
906
long t_start = range->ranges.ranges[i].start;
907
long t_end = range->ranges.ranges[i].end;
908
long t_cur = t_start;
909
- int j_last;
909
+ unsigned int j_last;
910
911
while (j < diff->target.nr && diff->target.ranges[j].end < t_start)
912
j++;
line-log.h
+1
-1
@@ -14,7 +14,7 @@ struct range {
14
15
/* A set of ranges. The ranges must always be disjoint and sorted. */
16
struct range_set {
17
- int alloc, nr;
17
+ unsigned int alloc, nr;
18
struct range *ranges;
19
};
20
revision.c
+1
-1
@@ -1103,7 +1103,7 @@ static void add_rev_cmdline(struct rev_info *revs,
1103
unsigned flags)
1104
{
1105
struct rev_cmdline_info *info = &revs->cmdline;
1106
- int nr = info->nr;
1106
+ unsigned int nr = info->nr;
1107
1108
ALLOC_GROW(info->rev, nr + 1, info->alloc);
1109
info->rev[nr].item = item;
tree-walk.c
+1
-2
@@ -581,12 +581,11 @@ enum follow_symlinks_result get_tree_entry_follow_symlinks(unsigned char *tree_s
581
int retval = MISSING_OBJECT;
582
struct dir_state *parents = NULL;
583
size_t parents_alloc = 0;
584
- ssize_t parents_nr = 0;
584
+ size_t i, parents_nr = 0;
585
unsigned char current_tree_sha1[20];
586
struct strbuf namebuf = STRBUF_INIT;
587
struct tree_desc t;
588
int follows_remaining = GET_TREE_ENTRY_FOLLOW_SYMLINKS_MAX_LINKS;
589
- int i;
589
590
init_tree_desc(&t, NULL, 0UL);
591
strbuf_addstr(&namebuf, name);