averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

xdiff: delete local variables that alias fields in xrecord_t

Browse Source 
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>
This commit is contained in:
Ezekiel Newren
2025-09-26 22:41:52 +00:00
committed by Junio C Hamano
parent 7bdeb3afad
commit 7c6ce2e47b
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
xdiff/xemit.c
View File

@@ -23,12 +23,11 @@
#include "xinclude.h"
static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) {
long size, psize = strlen(pre);
char const *rec = xdf->recs[ri]->ptr;
static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb)
{
xrecord_t *rec = xdf->recs[ri];
size = xdf->recs[ri]->size;
if (xdl_emit_diffrec(rec, size, pre, psize, ecb) < 0)
if (xdl_emit_diffrec(rec->ptr, rec->size, pre, strlen(pre), ecb) < 0)
return -1;
return 0;
@@ -111,11 +110,11 @@ static long def_ff(const char *rec, long len, char *buf, long sz)
static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri,
char *buf, long sz)
{
const char *rec = xdf->recs[ri]->ptr;
long len = xdf->recs[ri]->size;
xrecord_t *rec = xdf->recs[ri];
if (!xecfg->find_func)
return def_ff(rec, len, buf, sz);
return xecfg->find_func(rec, len, buf, sz, xecfg->find_func_priv);
return def_ff(rec->ptr, rec->size, buf, sz);
return xecfg->find_func(rec->ptr, rec->size, buf, sz, xecfg->find_func_priv);
}
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,
static int is_empty_rec(xdfile_t *xdf, long ri)
{
const char *rec = xdf->recs[ri]->ptr;
long len = xdf->recs[ri]->size;
xrecord_t *rec = xdf->recs[ri];
long i = 0;
while (len > 0 && XDL_ISSPACE(*rec)) {
rec++;
len--;
}
return !len;
for (; i < rec->size && XDL_ISSPACE(rec->ptr[i]); i++);
return i == rec->size;
}
int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,