undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

is_blank_line(): take a single xrecord_t as argument

Browse Source 
There is no reason for it to take an array and index as argument, as it
only accesses a single element of the array.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2016-08-22 13:22:42 +02:00 committed by Junio C Hamano
parent cb0eded863
commit c06c0b6343
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xdiff/xdiffi.c
View File

@ -400,9 +400,9 @@ static xdchange_t *xdl_add_change(xdchange_t *xscr, long i1, long i2, long chg1,
} }
static int is_blank_line(xrecord_t **recs, long ix, long flags) static int is_blank_line(xrecord_t *rec, long flags)
{ {
return xdl_blankline(recs[ix]->ptr, recs[ix]->size, flags); return xdl_blankline(rec->ptr, rec->size, flags);
} }
static int recs_match(xrecord_t **recs, long ixs, long ix, long flags) static int recs_match(xrecord_t **recs, long ixs, long ix, long flags)
@ -485,7 +485,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* the group. * the group.
*/ */
while (ix < nrec && recs_match(recs, ixs, ix, flags)) { while (ix < nrec && recs_match(recs, ixs, ix, flags)) {
blank_lines += is_blank_line(recs, ix, flags); blank_lines += is_blank_line(recs[ix], flags);
rchg[ixs++] = 0; rchg[ixs++] = 0;
rchg[ix++] = 1; rchg[ix++] = 1;
@ -524,7 +524,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* back only if at all. * back only if at all.
*/ */
while (ixs > 0 && while (ixs > 0 &&
!is_blank_line(recs, ix - 1, flags) && !is_blank_line(recs[ix - 1], flags) &&
recs_match(recs, ixs - 1, ix - 1, flags)) { recs_match(recs, ixs - 1, ix - 1, flags)) {
rchg[--ixs] = 1; rchg[--ixs] = 1;
rchg[--ix] = 0; rchg[--ix] = 0;