xdiff: drop unused flags parameter from recs_match
Since 6b13bc3232 (xdiff: simplify comparison, 2021-11-17), we do not call xdl_recmatch() from xdiffi.c's recs_match(), so we no longer need the "flags" parameter. That in turn lets us drop the flags parameters from the group-slide functions which call it. There's no functional change here; it's just making these functions a little simpler. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Dec 3, 2021 at 00:12 UTC
1e45db12141789c084e96a46adcf70858f05a1bc
1 file changed
+9
-9
xdiff/xdiffi.c
+9
-9
@@ -390,7 +390,7 @@ static xdchange_t *xdl_add_change(xdchange_t *xscr, long i1, long i2, long chg1,
390
}
391
392
393
-static int recs_match(xrecord_t *rec1, xrecord_t *rec2, long flags)
393
+static int recs_match(xrecord_t *rec1, xrecord_t *rec2)
394
{
395
return (rec1->ha == rec2->ha);
396
}
@@ -756,10 +756,10 @@ static inline int group_previous(xdfile_t *xdf, struct xdlgroup *g)
756
* following group, expand this group to include it. Return 0 on success or -1
757
* if g cannot be slid down.
758
*/
759
-static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g, long flags)
759
+static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g)
760
{
761
if (g->end < xdf->nrec &&
762
- recs_match(xdf->recs[g->start], xdf->recs[g->end], flags)) {
762
+ recs_match(xdf->recs[g->start], xdf->recs[g->end])) {
763
xdf->rchg[g->start++] = 0;
764
xdf->rchg[g->end++] = 1;
765
@@ -777,10 +777,10 @@ static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g, long flags)
777
* into a previous group, expand this group to include it. Return 0 on success
778
* or -1 if g cannot be slid up.
779
*/
780
-static int group_slide_up(xdfile_t *xdf, struct xdlgroup *g, long flags)
780
+static int group_slide_up(xdfile_t *xdf, struct xdlgroup *g)
781
{
782
if (g->start > 0 &&
783
- recs_match(xdf->recs[g->start - 1], xdf->recs[g->end - 1], flags)) {
783
+ recs_match(xdf->recs[g->start - 1], xdf->recs[g->end - 1])) {
784
xdf->rchg[--g->start] = 1;
785
xdf->rchg[--g->end] = 0;
786
@@ -830,7 +830,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
830
end_matching_other = -1;
831
832
/* Shift the group backward as much as possible: */
833
- while (!group_slide_up(xdf, &g, flags))
833
+ while (!group_slide_up(xdf, &g))
834
if (group_previous(xdfo, &go))
835
BUG("group sync broken sliding up");
836
@@ -845,7 +845,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
845
846
/* Now shift the group forward as far as possible: */
847
while (1) {
848
- if (group_slide_down(xdf, &g, flags))
848
+ if (group_slide_down(xdf, &g))
849
break;
850
if (group_next(xdfo, &go))
851
BUG("group sync broken sliding down");
@@ -872,7 +872,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
872
* other file that it can align with.
873
*/
874
while (go.end == go.start) {
875
- if (group_slide_up(xdf, &g, flags))
875
+ if (group_slide_up(xdf, &g))
876
BUG("match disappeared");
877
if (group_previous(xdfo, &go))
878
BUG("group sync broken sliding to match");
@@ -915,7 +915,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
915
}
916
917
while (g.end > best_shift) {
918
- if (group_slide_up(xdf, &g, flags))
918
+ if (group_slide_up(xdf, &g))
919
BUG("best shift unreached");
920
if (group_previous(xdfo, &go))
921
BUG("group sync broken sliding to blank line");