Skip to content

Commit 7c6ce2e

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

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

xdiff/xemit.c

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@
2323
#include "xinclude.h"
2424

2525

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];
2929

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)
3231
return -1;
3332

3433
return 0;
@@ -111,11 +110,11 @@ static long def_ff(const char *rec, long len, char *buf, long sz)
111110
static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri,
112111
char *buf, long sz)
113112
{
114-
const char *rec = xdf->recs[ri]->ptr;
115-
long len = xdf->recs[ri]->size;
113+
xrecord_t *rec = xdf->recs[ri];
114+
116115
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);
119118
}
120119

121120
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,
151150

152151
static int is_empty_rec(xdfile_t *xdf, long ri)
153152
{
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;
156155

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;
162159
}
163160

164161
int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,

0 commit comments

Comments
 (0)