xdiff: make xdfile_t.nrec a size_t instead of long
size_t is used because nrec describes the number of elements for both recs, and for 'changed' + 2. 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
016538780e9f6e83a1d9c7b0ec771fb6c5583c0f
6 files changed
+26
-26
xdiff/xdiffi.c
+4
-4
@@ -483,7 +483,7 @@ static void measure_split(const xdfile_t *xdf, long split,
483
{
484
long i;
485
486
- if (split >= xdf->nrec) {
486
+ if (split >= (long)xdf->nrec) {
487
m->end_of_file = 1;
488
m->indent = -1;
489
} else {
@@ -506,7 +506,7 @@ static void measure_split(const xdfile_t *xdf, long split,
506
507
m->post_blank = 0;
508
m->post_indent = -1;
509
- for (i = split + 1; i < xdf->nrec; i++) {
509
+ for (i = split + 1; i < (long)xdf->nrec; i++) {
510
m->post_indent = get_indent(&xdf->recs[i]);
511
if (m->post_indent != -1)
512
break;
@@ -717,7 +717,7 @@ static void group_init(xdfile_t *xdf, struct xdlgroup *g)
717
*/
718
static inline int group_next(xdfile_t *xdf, struct xdlgroup *g)
719
{
720
- if (g->end == xdf->nrec)
720
+ if (g->end == (long)xdf->nrec)
721
return -1;
722
723
g->start = g->end + 1;
@@ -750,7 +750,7 @@ static inline int group_previous(xdfile_t *xdf, struct xdlgroup *g)
750
*/
751
static int group_slide_down(xdfile_t *xdf, struct xdlgroup *g)
752
{
753
- if (g->end < xdf->nrec &&
753
+ if (g->end < (long)xdf->nrec &&
754
recs_match(&xdf->recs[g->start], &xdf->recs[g->end])) {
755
xdf->changed[g->start++] = false;
756
xdf->changed[g->end++] = true;
xdiff/xemit.c
+10
-10
@@ -137,7 +137,7 @@ static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg,
137
buf = func_line ? func_line->buf : dummy;
138
size = func_line ? sizeof(func_line->buf) : sizeof(dummy);
139
140
- for (l = start; l != limit && 0 <= l && l < xe->xdf1.nrec; l += step) {
140
+ for (l = start; l != limit && 0 <= l && l < (long)xe->xdf1.nrec; l += step) {
141
long len = match_func_rec(&xe->xdf1, xecfg, l, buf, size);
142
if (len >= 0) {
143
if (func_line)
@@ -179,14 +179,14 @@ pre_context_calculation:
179
long fs1, i1 = xch->i1;
180
181
/* Appended chunk? */
182
- if (i1 >= xe->xdf1.nrec) {
182
+ if (i1 >= (long)xe->xdf1.nrec) {
183
long i2 = xch->i2;
184
185
/*
186
* We don't need additional context if
187
* a whole function was added.
188
*/
189
- while (i2 < xe->xdf2.nrec) {
189
+ while (i2 < (long)xe->xdf2.nrec) {
190
if (is_func_rec(&xe->xdf2, xecfg, i2))
191
goto post_context_calculation;
192
i2++;
@@ -196,7 +196,7 @@ pre_context_calculation:
196
* Otherwise get more context from the
197
* pre-image.
198
*/
199
- i1 = xe->xdf1.nrec - 1;
199
+ i1 = (long)xe->xdf1.nrec - 1;
200
}
201
202
fs1 = get_func_line(xe, xecfg, NULL, i1, -1);
@@ -228,8 +228,8 @@ pre_context_calculation:
228
229
post_context_calculation:
230
lctx = xecfg->ctxlen;
231
- lctx = XDL_MIN(lctx, xe->xdf1.nrec - (xche->i1 + xche->chg1));
232
- lctx = XDL_MIN(lctx, xe->xdf2.nrec - (xche->i2 + xche->chg2));
231
+ lctx = XDL_MIN(lctx, (long)xe->xdf1.nrec - (xche->i1 + xche->chg1));
232
+ lctx = XDL_MIN(lctx, (long)xe->xdf2.nrec - (xche->i2 + xche->chg2));
233
234
e1 = xche->i1 + xche->chg1 + lctx;
235
e2 = xche->i2 + xche->chg2 + lctx;
@@ -237,13 +237,13 @@ pre_context_calculation:
237
if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) {
238
long fe1 = get_func_line(xe, xecfg, NULL,
239
xche->i1 + xche->chg1,
240
- xe->xdf1.nrec);
240
+ (long)xe->xdf1.nrec);
241
while (fe1 > 0 && is_empty_rec(&xe->xdf1, fe1 - 1))
242
fe1--;
243
if (fe1 < 0)
244
- fe1 = xe->xdf1.nrec;
244
+ fe1 = (long)xe->xdf1.nrec;
245
if (fe1 > e1) {
246
- e2 = XDL_MIN(e2 + (fe1 - e1), xe->xdf2.nrec);
246
+ e2 = XDL_MIN(e2 + (fe1 - e1), (long)xe->xdf2.nrec);
247
e1 = fe1;
248
}
249
@@ -254,7 +254,7 @@ pre_context_calculation:
254
*/
255
if (xche->next) {
256
long l = XDL_MIN(xche->next->i1,
257
- xe->xdf1.nrec - 1);
257
+ (long)xe->xdf1.nrec - 1);
258
if (l - xecfg->ctxlen <= e1 ||
259
get_func_line(xe, xecfg, NULL, l, e1) < 0) {
260
xche = xche->next;
xdiff/xmerge.c
+4
-4
@@ -158,7 +158,7 @@ static int is_eol_crlf(xdfile_t *file, int i)
158
{
159
size_t size;
160
161
- if (i < file->nrec - 1)
161
+ if (i < (long)file->nrec - 1)
162
/* All lines before the last *must* end in LF */
163
return (size = file->recs[i].size) > 1 &&
164
file->recs[i].ptr[size - 2] == '\r';
@@ -317,7 +317,7 @@ static int xdl_fill_merge_buffer(xdfenv_t *xe1, const char *name1,
317
continue;
318
i = m->i1 + m->chg1;
319
}
320
- size += xdl_recs_copy(xe1, i, xe1->xdf2.nrec - i, 0, 0,
320
+ size += xdl_recs_copy(xe1, i, (int)xe1->xdf2.nrec - i, 0, 0,
321
dest ? dest + size : NULL);
322
return size;
323
}
@@ -622,7 +622,7 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1,
622
changes = c;
623
i0 = xscr1->i1;
624
i1 = xscr1->i2;
625
- i2 = xscr1->i1 + xe2->xdf2.nrec - xe2->xdf1.nrec;
625
+ i2 = xscr1->i1 + (long)xe2->xdf2.nrec - (long)xe2->xdf1.nrec;
626
chg0 = xscr1->chg1;
627
chg1 = xscr1->chg2;
628
chg2 = xscr1->chg1;
@@ -637,7 +637,7 @@ static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1,
637
if (!changes)
638
changes = c;
639
i0 = xscr2->i1;
640
- i1 = xscr2->i1 + xe1->xdf2.nrec - xe1->xdf1.nrec;
640
+ i1 = xscr2->i1 + (long)xe1->xdf2.nrec - (long)xe1->xdf1.nrec;
641
i2 = xscr2->i2;
642
chg0 = xscr2->chg1;
643
chg1 = xscr2->chg1;
xdiff/xpatience.c
+1
-1
@@ -370,5 +370,5 @@ static int patience_diff(xpparam_t const *xpp, xdfenv_t *env,
370
371
int xdl_do_patience_diff(xpparam_t const *xpp, xdfenv_t *env)
372
{
373
- return patience_diff(xpp, env, 1, env->xdf1.nrec, 1, env->xdf2.nrec);
373
+ return patience_diff(xpp, env, 1, (int)env->xdf1.nrec, 1, (int)env->xdf2.nrec);
374
}
xdiff/xprepare.c
+6
-6
@@ -153,7 +153,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
153
for (top = blk + bsize; cur < top; ) {
154
prev = cur;
155
hav = xdl_hash_record(&cur, top, xpp->flags);
156
- if (XDL_ALLOC_GROW(xdf->recs, xdf->nrec + 1, narec))
156
+ if (XDL_ALLOC_GROW(xdf->recs, (long)xdf->nrec + 1, narec))
157
goto abort;
158
crec = &xdf->recs[xdf->nrec++];
159
crec->ptr = prev;
@@ -287,7 +287,7 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd
287
/*
288
* Initialize temporary arrays with DISCARD, KEEP, or INVESTIGATE.
289
*/
290
- if ((mlim = xdl_bogosqrt(xdf1->nrec)) > XDL_MAX_EQLIMIT)
290
+ if ((mlim = xdl_bogosqrt((long)xdf1->nrec)) > XDL_MAX_EQLIMIT)
291
mlim = XDL_MAX_EQLIMIT;
292
for (i = xdf1->dstart, recs = &xdf1->recs[xdf1->dstart]; i <= xdf1->dend; i++, recs++) {
293
rcrec = cf->rcrecs[recs->minimal_perfect_hash];
@@ -295,7 +295,7 @@ static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *xdf1, xdfile_t *xd
295
action1[i] = (nm == 0) ? DISCARD: (nm >= mlim && !need_min) ? INVESTIGATE: KEEP;
296
}
297
298
- if ((mlim = xdl_bogosqrt(xdf2->nrec)) > XDL_MAX_EQLIMIT)
298
+ if ((mlim = xdl_bogosqrt((long)xdf2->nrec)) > XDL_MAX_EQLIMIT)
299
mlim = XDL_MAX_EQLIMIT;
300
for (i = xdf2->dstart, recs = &xdf2->recs[xdf2->dstart]; i <= xdf2->dend; i++, recs++) {
301
rcrec = cf->rcrecs[recs->minimal_perfect_hash];
@@ -348,7 +348,7 @@ static int xdl_trim_ends(xdfile_t *xdf1, xdfile_t *xdf2) {
348
349
recs1 = xdf1->recs;
350
recs2 = xdf2->recs;
351
- for (i = 0, lim = XDL_MIN(xdf1->nrec, xdf2->nrec); i < lim;
351
+ for (i = 0, lim = (long)XDL_MIN(xdf1->nrec, xdf2->nrec); i < lim;
352
i++, recs1++, recs2++)
353
if (recs1->minimal_perfect_hash != recs2->minimal_perfect_hash)
354
break;
@@ -361,8 +361,8 @@ static int xdl_trim_ends(xdfile_t *xdf1, xdfile_t *xdf2) {
361
if (recs1->minimal_perfect_hash != recs2->minimal_perfect_hash)
362
break;
363
364
- xdf1->dend = xdf1->nrec - i - 1;
365
- xdf2->dend = xdf2->nrec - i - 1;
364
+ xdf1->dend = (long)xdf1->nrec - i - 1;
365
+ xdf2->dend = (long)xdf2->nrec - i - 1;
366
367
return 0;
368
}
xdiff/xtypes.h
+1
-1
@@ -47,7 +47,7 @@ typedef struct s_xrecord {
47
48
typedef struct s_xdfile {
49
xrecord_t *recs;
50
- long nrec;
50
+ size_t nrec;
51
ptrdiff_t dstart, dend;
52
bool *changed;
53
long *rindex;