xdiff: delete local variables that alias fields in xrecord_t
Use the type xrecord_t as the local variable for the functions in the file xdiff/xemit.c. Most places directly reference the fields inside of this struct, doing that here makes it more consistent with the rest of the code. 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
7c6ce2e47b274b299dd0a3b185e70f2ee5e3e07a
1 file changed
+13
-16
xdiff/xemit.c
+13
-16
@@ -23,12 +23,11 @@
23
#include "xinclude.h"
24
25
26
-static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) {
27
- long size, psize = strlen(pre);
28
- char const *rec = xdf->recs[ri]->ptr;
26
+static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb)
27
+{
28
+ xrecord_t *rec = xdf->recs[ri];
29
30
- size = xdf->recs[ri]->size;
31
- if (xdl_emit_diffrec(rec, size, pre, psize, ecb) < 0)
30
+ if (xdl_emit_diffrec(rec->ptr, rec->size, pre, strlen(pre), ecb) < 0)
31
return -1;
32
33
return 0;
@@ -111,11 +110,11 @@ static long def_ff(const char *rec, long len, char *buf, long sz)
110
static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri,
111
char *buf, long sz)
112
{
114
- const char *rec = xdf->recs[ri]->ptr;
115
- long len = xdf->recs[ri]->size;
113
+ xrecord_t *rec = xdf->recs[ri];
114
+
115
if (!xecfg->find_func)
117
- return def_ff(rec, len, buf, sz);
118
- return xecfg->find_func(rec, len, buf, sz, xecfg->find_func_priv);
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);
118
}
119
120
static int is_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri)
@@ -151,14 +150,12 @@ static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg,
150
151
static int is_empty_rec(xdfile_t *xdf, long ri)
152
{
154
- const char *rec = xdf->recs[ri]->ptr;
155
- long len = xdf->recs[ri]->size;
153
+ xrecord_t *rec = xdf->recs[ri];
154
+ long i = 0;
155
157
- while (len > 0 && XDL_ISSPACE(*rec)) {
158
- rec++;
159
- len--;
160
- }
161
- return !len;
156
+ for (; i < rec->size && XDL_ISSPACE(rec->ptr[i]); i++);
157
+
158
+ return i == rec->size;
159
}
160
161
int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,