diff3: Clean up printing of ranges for edscript output
ClosedPublic
Actions

Authored by thj on Apr 18 2022, 1:22 PM.

Details

Reviewers

pstef
bapt

Group Reviewers

Klara

Commits

rG2184ca3f191d: diff3: Clean up printing of ranges for edscript output

Summary

Replace the edscript code that tracked and printed lines using byte
offsets with code that can work from line offsets.

This tidies up the reduces duplication in the edscript output code. It
also fixes the usage of the de struct so that it only tracks diffs as
line offsets rather than the usage changing from line offsets to byte
offsets during the lifetime of diff3.

Large files with large numbers of ranges will probably suffer in
performance here, but as we don't use diff3 yet this isn't a regression.
Include a warning for future hackers so they have a place to start
hacking from.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

thj created this revision.Apr 18 2022, 1:22 PM

Herald added a subscriber: imp. · View Herald TranscriptApr 18 2022, 1:22 PM

thj requested review of this revision.Apr 18 2022, 1:22 PM

Harbormaster completed remote builds in B45201: Diff 105098.Apr 18 2022, 1:23 PM

pstef added inline comments.Apr 18 2022, 2:02 PM

usr.bin/diff3/diff3.c
536	Missing space after `while` and in `if (++i > r->to-1)`. I wonder if it would make more sense to never free and nullify the buffer within the loop, but once it's over. I'd expect it'd be cheaper not to allocate every iteration, the buffer will be expanded and the pointer updated.