Page MenuHomeFreeBSD
Differential D53808

diff3: Use logical operations for booleans, not bitwise
ClosedPublic
Actions

Authored by emaste on Nov 18 2025, 5:08 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Aug 17, 10:36 PM
Unknown Object (File)
Thu, Aug 13, 6:14 PM
Unknown Object (File)
Thu, Aug 13, 6:14 PM
Unknown Object (File)
Tue, Aug 11, 11:19 PM
Unknown Object (File)
Sun, Aug 9, 1:17 AM
Unknown Object (File)
Sat, Aug 8, 9:27 PM
Unknown Object (File)
Fri, Aug 7, 10:13 PM
Unknown Object (File)
Fri, Aug 7, 7:33 AM
View All 99 Files
Subscribers
imp

Details

Reviewers
fuz
delphij
Commits
rG98d08b86b4e5: diff3: Use logical-not, not bitwise for booleans
rG56bdfd2d967a: diff3: Use logical-not, not bitwise for booleans
rGabcb80f46c26: diff3: Use logical-not, not bitwise for booleans

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

emaste requested review of this revision.Nov 18 2025, 5:08 PM
emaste created this revision.

Hmm, should also be && I guess.

emaste updated this revision to Diff 166695.Nov 18 2025, 5:41 PM

incompat is actually an int that's incremented, so is not necessarily 0/1. explicitly compare != 0
leave bitwise & in place as that's what's still in the upstream GNU diff3

fuz added inline comments.Nov 18 2025, 5:53 PM
contrib/diff/src/diff3.c
304

This changes the semantics if incompat is neither 0 nor 1. Could have been a bug before, but could also be intentional.

emaste added a comment.Nov 18 2025, 6:14 PM

I

contrib/diff/src/diff3.c
304

It was a bug; as the comment suggests any of the options AeExX3 without m should imply edscript. incompat is incremented for each of these options. Upstream has this fixed in a different way.

fuz accepted this revision.Nov 18 2025, 6:24 PM

Sounds reasonable.

This revision is now accepted and ready to land.Nov 18 2025, 6:24 PM
Closed by commit rGabcb80f46c26: diff3: Use logical-not, not bitwise for booleans (authored by emaste). · Explain WhyNov 18 2025, 6:55 PM
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rGabcb80f46c26: diff3: Use logical-not, not bitwise for booleans.
Herald added a subscriber: imp. · View Herald TranscriptNov 18 2025, 6:56 PM
emaste added a commit: rG56bdfd2d967a: diff3: Use logical-not, not bitwise for booleans.Dec 9 2025, 4:33 PM
emaste added a commit: rG98d08b86b4e5: diff3: Use logical-not, not bitwise for booleans.Dec 16 2025, 3:50 PM

Revision Contents
Changeset List

PathSize
contrib/
diff/
src/
6 lines

Diff 166711

View Options

contrib/diff/src/diff3.c

Loading...