kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

line-log: rename 'new' variables 

Rename C++ keyword in order to bring the codebase closer to being able
to be compiled with a C++ compiler.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Brandon Williams 2018-02-14 10:59:44 -08:00 committed by Junio C Hamano
parent 5925631597
commit 3ce9149619
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
line-log.c
View File

@ -151,29 +151,29 @@ static void range_set_union(struct range_set *out,


assert(out->nr == 0); assert(out->nr == 0);
while (i < a->nr || j < b->nr) { while (i < a->nr || j < b->nr) {
struct range *new; struct range *new_range;
if (i < a->nr && j < b->nr) { if (i < a->nr && j < b->nr) {
if (ra[i].start < rb[j].start) if (ra[i].start < rb[j].start)
new = &ra[i++]; new_range = &ra[i++];
else if (ra[i].start > rb[j].start) else if (ra[i].start > rb[j].start)
new = &rb[j++]; new_range = &rb[j++];
else if (ra[i].end < rb[j].end) else if (ra[i].end < rb[j].end)
new = &ra[i++]; new_range = &ra[i++];
else else
new = &rb[j++]; new_range = &rb[j++];
} else if (i < a->nr) /* b exhausted */ } else if (i < a->nr) /* b exhausted */
new = &ra[i++]; new_range = &ra[i++];
else /* a exhausted */ else /* a exhausted */
new = &rb[j++]; new_range = &rb[j++];
if (new->start == new->end) if (new_range->start == new_range->end)
; /* empty range */ ; /* empty range */
else if (!out->nr || out->ranges[out->nr-1].end < new->start) { else if (!out->nr || out->ranges[out->nr-1].end < new_range->start) {
range_set_grow(out, 1); range_set_grow(out, 1);
out->ranges[out->nr].start = new->start; out->ranges[out->nr].start = new_range->start;
out->ranges[out->nr].end = new->end; out->ranges[out->nr].end = new_range->end;
out->nr++; out->nr++;
} else if (out->ranges[out->nr-1].end < new->end) { } else if (out->ranges[out->nr-1].end < new_range->end) {
out->ranges[out->nr-1].end = new->end; out->ranges[out->nr-1].end = new_range->end;
} }
} }
} }
@ -696,18 +696,18 @@ static struct line_log_data *line_log_data_merge(struct line_log_data *a,
static void add_line_range(struct rev_info *revs, struct commit *commit, static void add_line_range(struct rev_info *revs, struct commit *commit,
struct line_log_data *range) struct line_log_data *range)
{ {
struct line_log_data *old = NULL; struct line_log_data *old_line = NULL;
struct line_log_data *new = NULL; struct line_log_data *new_line = NULL;


old = lookup_decoration(&revs->line_log_data, &commit->object); old_line = lookup_decoration(&revs->line_log_data, &commit->object);
if (old && range) { if (old_line && range) {
new = line_log_data_merge(old, range); new_line = line_log_data_merge(old_line, range);
free_line_log_data(old); free_line_log_data(old_line);
} else if (range) } else if (range)
new = line_log_data_copy(range); new_line = line_log_data_copy(range);


if (new) if (new_line)
add_decoration(&revs->line_log_data, &commit->object, new); add_decoration(&revs->line_log_data, &commit->object, new_line);
} }


static void clear_commit_line_range(struct rev_info *revs, struct commit *commit) static void clear_commit_line_range(struct rev_info *revs, struct commit *commit)
@ -1042,12 +1042,12 @@ static int process_diff_filepair(struct rev_info *rev,


static struct diff_filepair *diff_filepair_dup(struct diff_filepair *pair) static struct diff_filepair *diff_filepair_dup(struct diff_filepair *pair)
{ {
struct diff_filepair *new = xmalloc(sizeof(struct diff_filepair)); struct diff_filepair *new_filepair = xmalloc(sizeof(struct diff_filepair));
new->one = pair->one; new_filepair->one = pair->one;
new->two = pair->two; new_filepair->two = pair->two;
new->one->count++; new_filepair->one->count++;
new->two->count++; new_filepair->two->count++;
return new; return new_filepair;
} }


static void free_diffqueues(int n, struct diff_queue_struct *dq) static void free_diffqueues(int n, struct diff_queue_struct *dq)