d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff3: Simplify startmark calculation in Ascript

Browse Source 
Remove redundant calculation for startmark.

Sponsored by:	Klara, Inc.
This commit is contained in:
Tom Jones 2022-08-02 14:23:10 +01:00
parent 426afc8f52
commit 264a559ac8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.bin/diff3/diff3.c
View File

@ -638,14 +638,13 @@ Ascript(int n)
old = &de[n].old;
deletenew = (new->from == new->to);
deleteold = (old->from == old->to);
startmark = old->from + (old->to - old->from) - 1;
if (de[n].type == DIFF_TYPE2) {
if (!oflag || !overlap[n]) {
prange(old, deletenew);
printrange(fp[2], new);
} else {
startmark = new->from + (new->to - new->from);
startmark = new->to;
if (!deletenew)
startmark--;
@ -664,6 +663,8 @@ Ascript(int n)
}
} else if (de[n].type == DIFF_TYPE3) {
startmark = old->to - 1;
if (!oflag || !overlap[n]) {
prange(old, deletenew);
printrange(fp[2], new);