xdiff: delete superfluous function xdl_get_rec() in xemit
When xrecord_t was a linked list, and recs didn't exist, I assume this function walked the list until it found the right record. Accessing a contiguous array is so trivial that this function is now superfluous. Delete it. 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
7bdeb3afad908e52baab6e58397423aa2d2f3d29
1 file changed
+7
-16
xdiff/xemit.c
+7
-16
@@ -22,23 +22,14 @@
22
23
#include "xinclude.h"
24
25
-static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) {
26
-
27
- *rec = xdf->recs[ri]->ptr;
28
-
29
- return xdf->recs[ri]->size;
30
-}
31
-
25
26
static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) {
27
long size, psize = strlen(pre);
35
- char const *rec;
36
-
37
- size = xdl_get_rec(xdf, ri, &rec);
38
- if (xdl_emit_diffrec(rec, size, pre, psize, ecb) < 0) {
28
+ char const *rec = xdf->recs[ri]->ptr;
29
30
+ size = xdf->recs[ri]->size;
31
+ if (xdl_emit_diffrec(rec, size, pre, psize, ecb) < 0)
32
return -1;
41
- }
33
34
return 0;
35
}
@@ -120,8 +111,8 @@ static long def_ff(const char *rec, long len, char *buf, long sz)
111
static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri,
112
char *buf, long sz)
113
{
123
- const char *rec;
124
- long len = xdl_get_rec(xdf, ri, &rec);
114
+ const char *rec = xdf->recs[ri]->ptr;
115
+ long len = xdf->recs[ri]->size;
116
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);
@@ -160,8 +151,8 @@ static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg,
151
152
static int is_empty_rec(xdfile_t *xdf, long ri)
153
{
163
- const char *rec;
164
- long len = xdl_get_rec(xdf, ri, &rec);
154
+ const char *rec = xdf->recs[ri]->ptr;
155
+ long len = xdf->recs[ri]->size;
156
157
while (len > 0 && XDL_ISSPACE(*rec)) {
158
rec++;