diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2016-08-22 13:22:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-23 13:51:47 -0700 |
| commit | c06c0b634360935286de2767f7edaf953bbf16ce (patch) | |
| tree | 5fdcb4c20f1b82d05dff410873c171280f753774 /xdiff | |
| parent | cb0eded863c62a38e39da7921373fc5be29846cc (diff) | |
| download | git-c06c0b634360935286de2767f7edaf953bbf16ce.tar.gz git-c06c0b634360935286de2767f7edaf953bbf16ce.tar.xz | |
is_blank_line(): take a single xrecord_t as argument
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>
Diffstat (limited to 'xdiff')
| -rw-r--r-- | xdiff/xdiffi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c index 61deed8d4..ed2df640a 100644 --- a/xdiff/xdiffi.c +++ b/xdiff/xdiffi.c @@ -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) @@ -485,7 +485,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { * the group. */ 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[ix++] = 1; @@ -524,7 +524,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) { * back only if at all. */ 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)) { rchg[--ixs] = 1; rchg[--ix] = 0; |