cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge3: remove unnecessary variables

Browse source
This commit is contained in:
Ori Bernstein 2024-10-02 21:45:17 +00:00
parent 1cf37db07a
commit 8e301036fa
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/src/cmd/diff/merge3.c
View file

@ -91,7 +91,7 @@ char*
merge(Diff *l, Diff *r)
{
int lx, ly, rx, ry;
int il, ir, x, y, δ;
int il, ir, δ;
Change *lc, *rc;
char *status;
vlong ln;
@ -143,13 +143,11 @@ merge(Diff *l, Diff *r)
lc->oldy = min(lc->oldy+δ, l->len[0]);
lc->newy = min(lc->newy+δ, l->len[1]);
}
x = lc->oldx;
y = lc->oldy;
if(same(l, lc, r, rc)){
fetch(l, l->ixold, ln, x-1, l->input[0], "");
fetch(l, l->ixold, ln, lc->oldx-1, l->input[0], "");
fetch(l, l->ixnew, lc->newx, lc->newy, l->input[1], "");
}else{
fetch(l, l->ixold, ln, x-1, l->input[0], "");
fetch(l, l->ixold, ln, lc->oldx-1, l->input[0], "");
Bprint(&stdout, "<<<<<<<<<< %s\n", l->file2);
fetch(l, l->ixnew, lc->newx, lc->newy, l->input[1], "");
Bprint(&stdout, "========== original\n");
@ -159,7 +157,7 @@ merge(Diff *l, Diff *r)
Bprint(&stdout, ">>>>>>>>>>\n");
status = "conflict";
}
ln = y+1;
ln = lc->oldy+1;
il++;
ir++;
}else if(lc != nil && (rc == nil || lx < rx)){