xdiff: make xrecord_t.ptr a uint8_t instead of char
Make xrecord_t.ptr uint8_t because it's referring to bytes in memory. In order to avoid a refactor avalanche, many uses of this field were cast to char* or similar. Places where casting was unnecessary: xemit.c:156 xmerge.c:124 xmerge.c:127 xmerge.c:164 xmerge.c:169 xmerge.c:172 xmerge.c:178 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
10f97d6affcb59bdcb74a6878d3d9da0eec81296
7 files changed
+21
-21
xdiff/xdiffi.c
+4
-4
@@ -407,7 +407,7 @@ static int get_indent(xrecord_t *rec)
407
int ret = 0;
408
409
for (i = 0; i < rec->size; i++) {
410
- char c = rec->ptr[i];
410
+ char c = (char) rec->ptr[i];
411
412
if (!XDL_ISSPACE(c))
413
return ret;
@@ -993,11 +993,11 @@ static void xdl_mark_ignorable_lines(xdchange_t *xscr, xdfenv_t *xe, long flags)
993
994
rec = &xe->xdf1.recs[xch->i1];
995
for (i = 0; i < xch->chg1 && ignore; i++)
996
- ignore = xdl_blankline(rec[i].ptr, rec[i].size, flags);
996
+ ignore = xdl_blankline((const char *)rec[i].ptr, rec[i].size, flags);
997
998
rec = &xe->xdf2.recs[xch->i2];
999
for (i = 0; i < xch->chg2 && ignore; i++)
1000
- ignore = xdl_blankline(rec[i].ptr, rec[i].size, flags);
1000
+ ignore = xdl_blankline((const char *)rec[i].ptr, rec[i].size, flags);
1001
1002
xch->ignore = ignore;
1003
}
@@ -1008,7 +1008,7 @@ static int record_matches_regex(xrecord_t *rec, xpparam_t const *xpp) {
1008
size_t i;
1009
1010
for (i = 0; i < xpp->ignore_regex_nr; i++)
1011
- if (!regexec_buf(xpp->ignore_regex[i], rec->ptr, rec->size, 1,
1011
+ if (!regexec_buf(xpp->ignore_regex[i], (const char *)rec->ptr, rec->size, 1,
1012
®match, 0))
1013
return 1;
1014
xdiff/xemit.c
+3
-3
@@ -27,7 +27,7 @@ static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *
27
{
28
xrecord_t *rec = &xdf->recs[ri];
29
30
- if (xdl_emit_diffrec(rec->ptr, rec->size, pre, strlen(pre), ecb) < 0)
30
+ if (xdl_emit_diffrec((char const *)rec->ptr, rec->size, pre, strlen(pre), ecb) < 0)
31
return -1;
32
33
return 0;
@@ -113,8 +113,8 @@ static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri,
113
xrecord_t *rec = &xdf->recs[ri];
114
115
if (!xecfg->find_func)
116
- return def_ff(rec->ptr, rec->size, buf, sz);
117
- return xecfg->find_func(rec->ptr, rec->size, buf, sz, xecfg->find_func_priv);
116
+ return def_ff((const char *)rec->ptr, rec->size, buf, sz);
117
+ return xecfg->find_func((const char *)rec->ptr, rec->size, buf, sz, xecfg->find_func_priv);
118
}
119
120
static int is_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri)
xdiff/xmerge.c
+7
-7
@@ -101,8 +101,8 @@ static int xdl_merge_cmp_lines(xdfenv_t *xe1, int i1, xdfenv_t *xe2, int i2,
101
xrecord_t *rec2 = xe2->xdf2.recs + i2;
102
103
for (i = 0; i < line_count; i++) {
104
- int result = xdl_recmatch(rec1[i].ptr, rec1[i].size,
105
- rec2[i].ptr, rec2[i].size, flags);
104
+ int result = xdl_recmatch((const char *)rec1[i].ptr, rec1[i].size,
105
+ (const char *)rec2[i].ptr, rec2[i].size, flags);
106
if (!result)
107
return -1;
108
}
@@ -324,8 +324,8 @@ static int xdl_fill_merge_buffer(xdfenv_t *xe1, const char *name1,
324
325
static int recmatch(xrecord_t *rec1, xrecord_t *rec2, unsigned long flags)
326
{
327
- return xdl_recmatch(rec1->ptr, rec1->size,
328
- rec2->ptr, rec2->size, flags);
327
+ return xdl_recmatch((const char *)rec1->ptr, rec1->size,
328
+ (const char *)rec2->ptr, rec2->size, flags);
329
}
330
331
/*
@@ -382,10 +382,10 @@ static int xdl_refine_conflicts(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m,
382
* we have a very simple mmfile structure.
383
*/
384
t1.ptr = (char *)xe1->xdf2.recs[m->i1].ptr;
385
- t1.size = xe1->xdf2.recs[m->i1 + m->chg1 - 1].ptr
385
+ t1.size = (char *)xe1->xdf2.recs[m->i1 + m->chg1 - 1].ptr
386
+ xe1->xdf2.recs[m->i1 + m->chg1 - 1].size - t1.ptr;
387
t2.ptr = (char *)xe2->xdf2.recs[m->i2].ptr;
388
- t2.size = xe2->xdf2.recs[m->i2 + m->chg2 - 1].ptr
388
+ t2.size = (char *)xe2->xdf2.recs[m->i2 + m->chg2 - 1].ptr
389
+ xe2->xdf2.recs[m->i2 + m->chg2 - 1].size - t2.ptr;
390
if (xdl_do_diff(&t1, &t2, xpp, &xe) < 0)
391
return -1;
@@ -440,7 +440,7 @@ static int line_contains_alnum(const char *ptr, long size)
440
static int lines_contain_alnum(xdfenv_t *xe, int i, int chg)
441
{
442
for (; chg; chg--, i++)
443
- if (line_contains_alnum(xe->xdf2.recs[i].ptr,
443
+ if (line_contains_alnum((const char *)xe->xdf2.recs[i].ptr,
444
xe->xdf2.recs[i].size))
445
return 1;
446
return 0;
xdiff/xpatience.c
+1
-1
@@ -121,7 +121,7 @@ static void insert_record(xpparam_t const *xpp, int line, struct hashmap *map,
121
return;
122
map->entries[index].line1 = line;
123
map->entries[index].hash = record->ha;
124
- map->entries[index].anchor = is_anchor(xpp, map->env->xdf1.recs[line - 1].ptr);
124
+ map->entries[index].anchor = is_anchor(xpp, (const char *)map->env->xdf1.recs[line - 1].ptr);
125
if (!map->first)
126
map->first = map->entries + index;
127
if (map->last) {
xdiff/xprepare.c
+3
-3
@@ -99,8 +99,8 @@ static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t
99
hi = (long) XDL_HASHLONG(rec->ha, cf->hbits);
100
for (rcrec = cf->rchash[hi]; rcrec; rcrec = rcrec->next)
101
if (rcrec->rec.ha == rec->ha &&
102
- xdl_recmatch(rcrec->rec.ptr, rcrec->rec.size,
103
- rec->ptr, rec->size, cf->flags))
102
+ xdl_recmatch((const char *)rcrec->rec.ptr, rcrec->rec.size,
103
+ (const char *)rec->ptr, rec->size, cf->flags))
104
break;
105
106
if (!rcrec) {
@@ -156,7 +156,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
156
if (XDL_ALLOC_GROW(xdf->recs, xdf->nrec + 1, narec))
157
goto abort;
158
crec = &xdf->recs[xdf->nrec++];
159
- crec->ptr = prev;
159
+ crec->ptr = (uint8_t const *)prev;
160
crec->size = (long) (cur - prev);
161
crec->ha = hav;
162
if (xdl_classify_record(pass, cf, crec) < 0)
xdiff/xtypes.h
+1
-1
@@ -39,7 +39,7 @@ typedef struct s_chastore {
39
} chastore_t;
40
41
typedef struct s_xrecord {
42
- char const *ptr;
42
+ uint8_t const *ptr;
43
long size;
44
unsigned long ha;
45
} xrecord_t;
xdiff/xutils.c
+2
-2
@@ -465,10 +465,10 @@ int xdl_fall_back_diff(xdfenv_t *diff_env, xpparam_t const *xpp,
465
xdfenv_t env;
466
467
subfile1.ptr = (char *)diff_env->xdf1.recs[line1 - 1].ptr;
468
- subfile1.size = diff_env->xdf1.recs[line1 + count1 - 2].ptr +
468
+ subfile1.size = (char *)diff_env->xdf1.recs[line1 + count1 - 2].ptr +
469
diff_env->xdf1.recs[line1 + count1 - 2].size - subfile1.ptr;
470
subfile2.ptr = (char *)diff_env->xdf2.recs[line2 - 1].ptr;
471
- subfile2.size = diff_env->xdf2.recs[line2 + count2 - 2].ptr +
471
+ subfile2.size = (char *)diff_env->xdf2.recs[line2 + count2 - 2].ptr +
472
diff_env->xdf2.recs[line2 + count2 - 2].size - subfile2.ptr;
473
if (xdl_do_diff(&subfile1, &subfile2, xpp, &env) < 0)
474
return -1;