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

recs_match(): take two xrecord_t pointers as arguments

Browse Source 
There is no reason for it to take an array and two indexes as argument,
as it only accesses two elements 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:43 +02:00 committed by Junio C Hamano
parent c06c0b6343
commit 152598cbb6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xdiff/xdiffi.c
View File

@ -405,11 +405,11 @@ static int is_blank_line(xrecord_t *rec, long flags)
return xdl_blankline(rec->ptr, rec->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 *rec1, xrecord_t *rec2, long flags)
{ {
return (recs[ixs]->ha == recs[ix]->ha && return (rec1->ha == rec2->ha &&
xdl_recmatch(recs[ixs]->ptr, recs[ixs]->size, xdl_recmatch(rec1->ptr, rec1->size,
recs[ix]->ptr, recs[ix]->size, rec2->ptr, rec2->size,
flags)); flags));
} }
@ -457,7 +457,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* the last line of the current change group, shift backward * the last line of the current change group, shift backward
* the group. * the group.
*/ */
while (ixs > 0 && recs_match(recs, ixs - 1, ix - 1, flags)) { while (ixs > 0 && recs_match(recs[ixs - 1], recs[ix - 1], flags)) {
rchg[--ixs] = 1; rchg[--ixs] = 1;
rchg[--ix] = 0; rchg[--ix] = 0;
@ -484,7 +484,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* the line next of the current change group, shift forward * the line next of the current change group, shift forward
* the group. * the group.
*/ */
while (ix < nrec && recs_match(recs, ixs, ix, flags)) { while (ix < nrec && recs_match(recs[ixs], recs[ix], flags)) {
blank_lines += is_blank_line(recs[ix], flags); blank_lines += is_blank_line(recs[ix], flags);
rchg[ixs++] = 0; rchg[ixs++] = 0;
@ -525,7 +525,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
*/ */
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], recs[ix - 1], flags)) {
rchg[--ixs] = 1; rchg[--ixs] = 1;
rchg[--ix] = 0; rchg[--ix] = 0;
while (rchgo[--ixo]); while (rchgo[--ixo]);