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

diff3: Don't perform a bitwise OR when comparing diffs

Browse Source 
This fixes the build now that it uses -Wbitwise-instead-of-logical

Sponsored by:	Klara Inc.
This commit is contained in:
Tom Jones 2022-05-25 14:41:43 +01:00
parent e605b87a9e
commit 7d975c7f93
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,7 +304,7 @@ merge(int m1, int m2)
d2 = d23;
j = 0;
while ((t1 = d1 < d13 + m1) | (t2 = d2 < d23 + m2)) {
while (t1 = d1 < d13 + m1, t2 = d2 < d23 + m2, t1 || t2) {
/* first file is different from the others */
if (!t2 || (t1 && d1->new.to < d2->new.from)) {
/* stuff peculiar to 1st file */