|
|
|
@ -90,7 +90,7 @@ static int range_cmp(const void *_r, const void *_s)
@@ -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)
@@ -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)
@@ -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,
@@ -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,
@@ -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,
@@ -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)
@@ -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
@@ -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++; |
|
|
|
|