Page MenuHomeFreeBSD
Differential D35324

Try to make eflag easier to follow
ClosedPublic
Actions

Authored by thj on May 26 2022, 1:23 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Oct 17, 3:49 AM
Unknown Object (File)
Wed, Oct 15, 9:34 AM
Unknown Object (File)
Wed, Oct 15, 9:34 AM
Unknown Object (File)
Wed, Oct 15, 9:34 AM
Unknown Object (File)
Wed, Oct 15, 9:34 AM
Unknown Object (File)
Tue, Oct 14, 10:53 PM
Unknown Object (File)
Sun, Oct 12, 9:48 AM
Unknown Object (File)
Fri, Oct 10, 8:22 AM
View All Files
Subscribers
dim
imp
Contributor Reviews (src)

Details

Reviewers
None
Group Reviewers
Klara
Commits
rGd458eb8de12c: diff3: make the eflag logic easier to follow
Summary

no functional change intended

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 45719
Build 42607: arc lint + arc unit

Event Timeline

thj created this revision.May 26 2022, 1:23 PM
Herald added subscribers: Contributor Reviews (src), imp. · View Herald TranscriptMay 26 2022, 1:23 PM
thj requested review of this revision.May 26 2022, 1:23 PM
Harbormaster completed remote builds in B45719: Diff 106386.May 26 2022, 1:23 PM
thj added a reviewer: Klara.May 26 2022, 1:25 PM
dim added a subscriber: dim.May 26 2022, 1:29 PM
dim added inline comments.
usr.bin/diff3/diff3.c
115

I'd have called this EFLAG_NONE, for consistency; but it's a matter of taste. :)

549

I'd write this as:

if ( (!dup && (eflag == EFLAG_OVERLAP || eflag == EFLAG_UNMERGED) || (dup && (eflag == EFLAG_NOOVERLAP || eflag == EFLAG_UNMERGED)) )

and get rid of the bitmasking stuff. You can then also get rid of the comment altogether (or maybe simplify it.)

thj updated this revision to Diff 107778.Jul 5 2022, 11:29 AM
thj retitled this revision from Try to make eflag easier to follow no functional change intended to Try to make eflag easier to follow.
thj edited the summary of this revision. (Show Details)

simplfy the eflag based on suggestions by dim

Harbormaster completed remote builds in B46267: Diff 107778.Jul 5 2022, 11:29 AM
This revision was not accepted when it landed; it landed in state Needs Review.Jul 5 2022, 11:37 AM
Closed by commit rGd458eb8de12c: diff3: make the eflag logic easier to follow (authored by thj). · Explain Why
This revision was automatically updated to reflect the committed changes.
thj added a commit: rGd458eb8de12c: diff3: make the eflag logic easier to follow.

Revision Contents
Changeset List

PathSize
usr.bin/
diff3/
37 lines

Diff 106386

View Options

usr.bin/diff3/diff3.c

Loading...