xdiff: rename rchg -> changed in xdfile_t
The field rchg (now 'changed') declares if a line in a file is changed or not. A later commit will change it's type from 'char' to 'bool' to make its purpose even more clear. Best-viewed-with: --color-words Signed-off-by: Ezekiel Newren <ezekielnewren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ezekiel Newren committed
Sep 26, 2025 at 22:41 UTC
b7de64a6d6f58953a0c1dc7ff34f7080b3e38b37
6 files changed
+32
-32
xdiff/xdiffi.c
+15
-15
@@ -278,10 +278,10 @@ int xdl_recs_cmp(xdfile_t *xdf1, long off1, long lim1,
278
*/
279
if (off1 == lim1) {
280
for (; off2 < lim2; off2++)
281
- xdf2->rchg[xdf2->rindex[off2]] = 1;
281
+ xdf2->changed[xdf2->rindex[off2]] = 1;
282
} else if (off2 == lim2) {
283
for (; off1 < lim1; off1++)
284
- xdf1->rchg[xdf1->rindex[off1]] = 1;
284
+ xdf1->changed[xdf1->rindex[off1]] = 1;
285
} else {
286
xdpsplit_t spl;
287
spl.i1 = spl.i2 = 0;
@@ -708,7 +708,7 @@ struct xdlgroup {
708
static void group_init(xdfile_t *xdf, struct xdlgroup *g)
709
{
710
g->start = g->end = 0;
711
- while (xdf->rchg[g->end])
711
+ while (xdf->changed[g->end])
712
g->end++;
713
}
714
@@ -722,7 +722,7 @@ static inline int group_next(xdfile_t *xdf, struct xdlgroup *g)
722
return -1;
723
724
g->start = g->end + 1;
725
- for (g->end = g->start; xdf->rchg[g->end]; g->end++)
725
+ for (g->end = g->start; xdf->changed[g->end]; g->end++)
726
;
727
728
return 0;
@@ -738,7 +738,7 @@ static inline int group_previous(xdfile_t *xdf, struct xdlgroup *g)
738
return -1;
739
740
g->end = g->start - 1;
741
- for (g->start = g->end; xdf->rchg[g->start - 1]; g->start--)
741
+ for (g->start = g->end; xdf->changed[g->start - 1]; g->start--)
742
;
743
744
return 0;
@@ -753,10 +753,10 @@ static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g)
753
{
754
if (g->end < xdf->nrec &&
755
recs_match(&xdf->recs[g->start], &xdf->recs[g->end])) {
756
- xdf->rchg[g->start++] = 0;
757
- xdf->rchg[g->end++] = 1;
756
+ xdf->changed[g->start++] = 0;
757
+ xdf->changed[g->end++] = 1;
758
759
- while (xdf->rchg[g->end])
759
+ while (xdf->changed[g->end])
760
g->end++;
761
762
return 0;
@@ -774,10 +774,10 @@ static int group_slide_up(xdfile_t *xdf, struct xdlgroup *g)
774
{
775
if (g->start > 0 &&
776
recs_match(&xdf->recs[g->start - 1], &xdf->recs[g->end - 1])) {
777
- xdf->rchg[--g->start] = 1;
778
- xdf->rchg[--g->end] = 0;
777
+ xdf->changed[--g->start] = 1;
778
+ xdf->changed[--g->end] = 0;
779
780
- while (xdf->rchg[g->start - 1])
780
+ while (xdf->changed[g->start - 1])
781
g->start--;
782
783
return 0;
@@ -932,16 +932,16 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
932
933
int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr) {
934
xdchange_t *cscr = NULL, *xch;
935
- char *rchg1 = xe->xdf1.rchg, *rchg2 = xe->xdf2.rchg;
935
+ char *changed1 = xe->xdf1.changed, *changed2 = xe->xdf2.changed;
936
long i1, i2, l1, l2;
937
938
/*
939
* Trivial. Collects "groups" of changes and creates an edit script.
940
*/
941
for (i1 = xe->xdf1.nrec, i2 = xe->xdf2.nrec; i1 >= 0 || i2 >= 0; i1--, i2--)
942
- if (rchg1[i1 - 1] || rchg2[i2 - 1]) {
943
- for (l1 = i1; rchg1[i1 - 1]; i1--);
944
- for (l2 = i2; rchg2[i2 - 1]; i2--);
942
+ if (changed1[i1 - 1] || changed2[i2 - 1]) {
943
+ for (l1 = i1; changed1[i1 - 1]; i1--);
944
+ for (l2 = i2; changed2[i2 - 1]; i2--);
945
946
if (!(xch = xdl_add_change(cscr, i1, i2, l1 - i1, l2 - i2))) {
947
xdl_free_script(cscr);
xdiff/xhistogram.c
+4
-4
@@ -318,11 +318,11 @@ redo:
318
319
if (!count1) {
320
while(count2--)
321
- env->xdf2.rchg[line2++ - 1] = 1;
321
+ env->xdf2.changed[line2++ - 1] = 1;
322
return 0;
323
} else if (!count2) {
324
while(count1--)
325
- env->xdf1.rchg[line1++ - 1] = 1;
325
+ env->xdf1.changed[line1++ - 1] = 1;
326
return 0;
327
}
328
@@ -335,9 +335,9 @@ redo:
335
else {
336
if (lcs.begin1 == 0 && lcs.begin2 == 0) {
337
while (count1--)
338
- env->xdf1.rchg[line1++ - 1] = 1;
338
+ env->xdf1.changed[line1++ - 1] = 1;
339
while (count2--)
340
- env->xdf2.rchg[line2++ - 1] = 1;
340
+ env->xdf2.changed[line2++ - 1] = 1;
341
result = 0;
342
} else {
343
result = histogram_diff(xpp, env,
xdiff/xpatience.c
+4
-4
@@ -331,11 +331,11 @@ static int patience_diff(xpparam_t const *xpp, xdfenv_t *env,
331
/* trivial case: one side is empty */
332
if (!count1) {
333
while(count2--)
334
- env->xdf2.rchg[line2++ - 1] = 1;
334
+ env->xdf2.changed[line2++ - 1] = 1;
335
return 0;
336
} else if (!count2) {
337
while(count1--)
338
- env->xdf1.rchg[line1++ - 1] = 1;
338
+ env->xdf1.changed[line1++ - 1] = 1;
339
return 0;
340
}
341
@@ -347,9 +347,9 @@ static int patience_diff(xpparam_t const *xpp, xdfenv_t *env,
347
/* are there any matching lines at all? */
348
if (!map.has_matches) {
349
while(count1--)
350
- env->xdf1.rchg[line1++ - 1] = 1;
350
+ env->xdf1.changed[line1++ - 1] = 1;
351
while(count2--)
352
- env->xdf2.rchg[line2++ - 1] = 1;
352
+ env->xdf2.changed[line2++ - 1] = 1;
353
xdl_free(map.entries);
354
return 0;
355
}
xdiff/xprepare.c
+6
-6
@@ -126,7 +126,7 @@ static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t
126
static void xdl_free_ctx(xdfile_t *xdf)
127
{
128
xdl_free(xdf->rindex);
129
- xdl_free(xdf->rchg - 1);
129
+ xdl_free(xdf->changed - 1);
130
xdl_free(xdf->recs);
131
}
132
@@ -139,7 +139,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
139
xrecord_t *crec;
140
141
xdf->rindex = NULL;
142
- xdf->rchg = NULL;
142
+ xdf->changed = NULL;
143
xdf->recs = NULL;
144
145
if (!XDL_ALLOC_ARRAY(xdf->recs, narec))
@@ -161,7 +161,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
161
}
162
}
163
164
- if (!XDL_CALLOC_ARRAY(xdf->rchg, xdf->nrec + 2))
164
+ if (!XDL_CALLOC_ARRAY(xdf->changed, xdf->nrec + 2))
165
goto abort;
166
167
if ((XDF_DIFF_ALG(xpp->flags) != XDF_PATIENCE_DIFF) &&
@@ -170,7 +170,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
170
goto abort;
171
}
172
173
- xdf->rchg += 1;
173
+ xdf->changed += 1;
174
xdf->nreff = 0;
175
xdf->dstart = 0;
176
xdf->dend = xdf->nrec - 1;
@@ -287,7 +287,7 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd
287
(dis1[i] == 2 && !xdl_clean_mmatch(dis1, i, xdf1->dstart, xdf1->dend))) {
288
xdf1->rindex[nreff++] = i;
289
} else
290
- xdf1->rchg[i] = 1;
290
+ xdf1->changed[i] = 1;
291
}
292
xdf1->nreff = nreff;
293
@@ -297,7 +297,7 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd
297
(dis2[i] == 2 && !xdl_clean_mmatch(dis2, i, xdf2->dstart, xdf2->dend))) {
298
xdf2->rindex[nreff++] = i;
299
} else
300
- xdf2->rchg[i] = 1;
300
+ xdf2->changed[i] = 1;
301
}
302
xdf2->nreff = nreff;
303
xdiff/xtypes.h
+1
-1
@@ -48,7 +48,7 @@ typedef struct s_xdfile {
48
xrecord_t *recs;
49
long nrec;
50
long dstart, dend;
51
- char *rchg;
51
+ char *changed;
52
long *rindex;
53
long nreff;
54
} xdfile_t;
xdiff/xutils.c
+2
-2
@@ -425,8 +425,8 @@ int xdl_fall_back_diff(xdfenv_t *diff_env, xpparam_t const *xpp,
425
if (xdl_do_diff(&subfile1, &subfile2, xpp, &env) < 0)
426
return -1;
427
428
- memcpy(diff_env->xdf1.rchg + line1 - 1, env.xdf1.rchg, count1);
429
- memcpy(diff_env->xdf2.rchg + line2 - 1, env.xdf2.rchg, count2);
428
+ memcpy(diff_env->xdf1.changed + line1 - 1, env.xdf1.changed, count1);
429
+ memcpy(diff_env->xdf2.changed + line2 - 1, env.xdf2.changed, count2);
430
431
xdl_free_env(&env);
432