ALLOC_GROW: avoid -Wsign-compare warnings
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
356a293f39
commit
071bcaab64
@ -2556,8 +2556,8 @@ struct in_pack_object {
|
||||
};
|
||||
|
||||
struct in_pack {
|
||||
int alloc;
|
||||
int nr;
|
||||
unsigned int alloc;
|
||||
unsigned int nr;
|
||||
struct in_pack_object *array;
|
||||
};
|
||||
|
||||
|
2
config.c
2
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;
|
||||
int seen;
|
||||
unsigned int seen;
|
||||
} store;
|
||||
|
||||
static int matches(const char *key, const char *value)
|
||||
|
2
diff.c
2
diff.c
@ -825,7 +825,7 @@ static void emit_rewrite_diff(const char *name_a,
|
||||
|
||||
struct diff_words_buffer {
|
||||
mmfile_t text;
|
||||
long alloc;
|
||||
unsigned long alloc;
|
||||
struct diff_words_orig {
|
||||
const char *begin, *end;
|
||||
} *orig;
|
||||
|
18
line-log.c
18
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)
|
||||
{
|
||||
int i;
|
||||
unsigned int i;
|
||||
|
||||
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)
|
||||
{
|
||||
int i;
|
||||
int o = 0; /* output cursor */
|
||||
unsigned int i;
|
||||
unsigned int o = 0; /* output cursor */
|
||||
|
||||
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)
|
||||
{
|
||||
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 */
|
||||
@ -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)
|
||||
{
|
||||
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;
|
||||
@ -397,7 +397,7 @@ static void diff_ranges_filter_touched(struct diff_ranges *out,
|
||||
struct diff_ranges *diff,
|
||||
struct range_set *rs)
|
||||
{
|
||||
int i, j = 0;
|
||||
unsigned int i, j = 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)
|
||||
{
|
||||
int i, j = 0;
|
||||
unsigned int i, j = 0;
|
||||
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)
|
||||
{
|
||||
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;
|
||||
@ -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;
|
||||
int j_last;
|
||||
unsigned int j_last;
|
||||
|
||||
while (j < diff->target.nr && diff->target.ranges[j].end < t_start)
|
||||
j++;
|
||||
|
@ -14,7 +14,7 @@ struct range {
|
||||
|
||||
/* 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;
|
||||
};
|
||||
|
||||
|
@ -1103,7 +1103,7 @@ static void add_rev_cmdline(struct rev_info *revs,
|
||||
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;
|
||||
|
@ -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;
|
||||
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;
|
||||
int i;
|
||||
|
||||
init_tree_desc(&t, NULL, 0UL);
|
||||
strbuf_addstr(&namebuf, name);
|
||||
|
Loading…
Reference in New Issue
Block a user