mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

combine-diff: rename 'new' variables

Browse Source 
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>
This commit is contained in:
Brandon Williams
2018-02-14 10:59:36 -08:00
committed by Junio C Hamano
parent b537e0b1cf
commit 06fffa000c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
combine-diff.c
View File

@ -162,7 +162,7 @@ enum coalesce_direction { MATCH, BASE, NEW };
/* Coalesce new lines into base by finding LCS */ /* Coalesce new lines into base by finding LCS */
static struct lline *coalesce_lines(struct lline *base, int *lenbase, static struct lline *coalesce_lines(struct lline *base, int *lenbase,
struct lline *new, int lennew, struct lline *newline, int lennew,
unsigned long parent, long flags) unsigned long parent, long flags)
{ {
int **lcs; int **lcs;
@ -170,12 +170,12 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
struct lline *baseend, *newend = NULL; struct lline *baseend, *newend = NULL;
int i, j, origbaselen = *lenbase; int i, j, origbaselen = *lenbase;
if (new == NULL) if (newline == NULL)
return base; return base;
if (base == NULL) { if (base == NULL) {
*lenbase = lennew; *lenbase = lennew;
return new; return newline;
} }
/* /*
@ -200,7 +200,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
directions[0][j] = NEW; directions[0][j] = NEW;
for (i = 1, baseend = base; i < origbaselen + 1; i++) { for (i = 1, baseend = base; i < origbaselen + 1; i++) {
for (j = 1, newend = new; j < lennew + 1; j++) { for (j = 1, newend = newline; j < lennew + 1; j++) {
if (match_string_spaces(baseend->line, baseend->len, if (match_string_spaces(baseend->line, baseend->len,
newend->line, newend->len, flags)) { newend->line, newend->len, flags)) {
lcs[i][j] = lcs[i - 1][j - 1] + 1; lcs[i][j] = lcs[i - 1][j - 1] + 1;
@ -241,7 +241,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
if (lline->prev) if (lline->prev)
lline->prev->next = lline->next; lline->prev->next = lline->next;
else else
new = lline->next; newline = lline->next;
if (lline->next) if (lline->next)
lline->next->prev = lline->prev; lline->next->prev = lline->prev;
@ -270,7 +270,7 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
} }
} }
newend = new; newend = newline;
while (newend) { while (newend) {
struct lline *lline = newend; struct lline *lline = newend;
newend = newend->next; newend = newend->next;