Skip to content

Commit 7bdeb3a

Browse files
ezekielnewrengitster
authored andcommitted
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>
1 parent efaf553 commit 7bdeb3a

1 file changed

Lines changed: 7 additions & 16 deletions

File tree

xdiff/xemit.c

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,14 @@
2222

2323
#include "xinclude.h"
2424

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-
3225

3326
static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) {
3427
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;
3929

30+
size = xdf->recs[ri]->size;
31+
if (xdl_emit_diffrec(rec, size, pre, psize, ecb) < 0)
4032
return -1;
41-
}
4233

4334
return 0;
4435
}
@@ -120,8 +111,8 @@ static long def_ff(const char *rec, long len, char *buf, long sz)
120111
static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri,
121112
char *buf, long sz)
122113
{
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;
125116
if (!xecfg->find_func)
126117
return def_ff(rec, len, buf, sz);
127118
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,
160151

161152
static int is_empty_rec(xdfile_t *xdf, long ri)
162153
{
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;
165156

166157
while (len > 0 && XDL_ISSPACE(*rec)) {
167158
rec++;

0 commit comments

Comments
 (0)