xdiff: make xdfile_t.nreff a size_t instead of long
size_t is used because nreff describes the number of elements in memory for rindex. Signed-off-by: Ezekiel Newren <ezekielnewren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ezekiel Newren committed
Nov 18, 2025 at 22:34 UTC
e35877eadbd9bee473936577c82abca9c8333abd
2 files changed
+8
-8
xdiff/xprepare.c
+7
-7
@@ -264,7 +264,7 @@ static bool xdl_clean_mmatch(uint8_t const *action, long i, long s, long e) {
264
* might be potentially discarded if they appear in a run of discardable.
265
*/
266
static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xdf2) {
267
- long i, nm, nreff, mlim;
267
+ long i, nm, mlim;
268
xrecord_t *recs;
269
xdlclass_t *rcrec;
270
uint8_t *action1 = NULL, *action2 = NULL;
@@ -307,29 +307,29 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd
307
* Use temporary arrays to decide if changed[i] should remain
308
* false, or become true.
309
*/
310
- for (nreff = 0, i = xdf1->dstart, recs = &xdf1->recs[xdf1->dstart];
310
+ xdf1->nreff = 0;
311
+ for (i = xdf1->dstart, recs = &xdf1->recs[xdf1->dstart];
312
i <= xdf1->dend; i++, recs++) {
313
if (action1[i] == KEEP ||
314
(action1[i] == INVESTIGATE && !xdl_clean_mmatch(action1, i, xdf1->dstart, xdf1->dend))) {
314
- xdf1->rindex[nreff++] = i;
315
+ xdf1->rindex[xdf1->nreff++] = i;
316
/* changed[i] remains false, i.e. keep */
317
} else
318
xdf1->changed[i] = true;
319
/* i.e. discard */
320
}
320
- xdf1->nreff = nreff;
321
322
- for (nreff = 0, i = xdf2->dstart, recs = &xdf2->recs[xdf2->dstart];
322
+ xdf2->nreff = 0;
323
+ for (i = xdf2->dstart, recs = &xdf2->recs[xdf2->dstart];
324
i <= xdf2->dend; i++, recs++) {
325
if (action2[i] == KEEP ||
326
(action2[i] == INVESTIGATE && !xdl_clean_mmatch(action2, i, xdf2->dstart, xdf2->dend))) {
326
- xdf2->rindex[nreff++] = i;
327
+ xdf2->rindex[xdf2->nreff++] = i;
328
/* changed[i] remains false, i.e. keep */
329
} else
330
xdf2->changed[i] = true;
331
/* i.e. discard */
332
}
332
- xdf2->nreff = nreff;
333
334
cleanup:
335
xdl_free(action1);
xdiff/xtypes.h
+1
-1
@@ -51,7 +51,7 @@ typedef struct s_xdfile {
51
ptrdiff_t dstart, dend;
52
bool *changed;
53
long *rindex;
54
- long nreff;
54
+ size_t nreff;
55
} xdfile_t;
56
57
typedef struct s_xdfenv {