[PATCH 1/8] xdl_change_compact(): rename some local variables for clarity
* ix -> i
* ixo -> io
* ixs -> start
* grpsiz -> groupsize
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
Thankfully, we don't have to limit indentifers to six characters, so
start naming things more understandably.
xdiff/xdiffi.c | 66 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index b3c6848..ff7fc42 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -414,7 +414,7 @@ static int recs_match(xrecord_t **recs, long ixs, long ix, long flags)
}
int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
- long ix, ixo, ixs, ixref, grpsiz, nrec = xdf->nrec;
+ long i, io, start, ixref, groupsize, nrec = xdf->nrec;
char *rchg = xdf->rchg, *rchgo = xdfo->rchg;
unsigned int blank_lines;
xrecord_t **recs = xdf->recs;
@@ -424,7 +424,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* change groups for a consistent and pretty diff output. This also
* helps in finding joinable change groups and reduce the diff size.
*/
- for (ix = ixo = 0;;) {
+ for (i = io = 0;;) {
/*
* Find the first changed line in the to-be-compacted file.
* We need to keep track of both indexes, so if we find a
@@ -434,22 +434,22 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* not need index bounding since the array is prepared with
* a zero at position -1 and N.
*/
- for (; ix < nrec && !rchg[ix]; ix++)
- while (rchgo[ixo++]);
- if (ix == nrec)
+ for (; i < nrec && !rchg[i]; i++)
+ while (rchgo[io++]);
+ if (i == nrec)
break;
/*
* Record the start of a changed-group in the to-be-compacted file
* and find the end of it, on both to-be-compacted and other file
- * indexes (ix and ixo).
+ * indexes (i and io).
*/
- ixs = ix;
- for (ix++; rchg[ix]; ix++);
- for (; rchgo[ixo]; ixo++);
+ start = i;
+ for (i++; rchg[i]; i++);
+ for (; rchgo[io]; io++);
do {
- grpsiz = ix - ixs;
+ groupsize = i - start;
blank_lines = 0;
/*
@@ -457,9 +457,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* the last line of the current change group, shift backward
* the group.
*/
- while (ixs > 0 && recs_match(recs, ixs - 1, ix - 1, flags)) {
- rchg[--ixs] = 1;
- rchg[--ix] = 0;
+ while (start > 0 && recs_match(recs, start - 1, i - 1, flags)) {
+ rchg[--start] = 1;
+ rchg[--i] = 0;
/*
* This change might have joined two change groups,
@@ -467,8 +467,8 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* the start index accordingly (and so the other-file
* end-of-group index).
*/
- for (; rchg[ixs - 1]; ixs--);
- while (rchgo[--ixo]);
+ for (; rchg[start - 1]; start--);
+ while (rchgo[--io]);
}
/*
@@ -477,18 +477,18 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* change record before the end-of-group index in the other
* file is set).
*/
- ixref = rchgo[ixo - 1] ? ix: nrec;
+ ixref = rchgo[io - 1] ? i : nrec;
/*
* If the first line of the current change group, is equal to
* the line next of the current change group, shift forward
* the group.
*/
- while (ix < nrec && recs_match(recs, ixs, ix, flags)) {
- blank_lines += is_blank_line(recs, ix, flags);
+ while (i < nrec && recs_match(recs, start, i, flags)) {
+ blank_lines += is_blank_line(recs, i, flags);
- rchg[ixs++] = 0;
- rchg[ix++] = 1;
+ rchg[start++] = 0;
+ rchg[i++] = 1;
/*
* This change might have joined two change groups,
@@ -498,20 +498,20 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* index in case we are shifting together with a
* corresponding group of changes in the other file.
*/
- for (; rchg[ix]; ix++);
- while (rchgo[++ixo])
- ixref = ix;
+ for (; rchg[i]; i++);
+ while (rchgo[++io])
+ ixref = i;
}
- } while (grpsiz != ix - ixs);
+ } while (groupsize != i - start);
/*
* Try to move back the possibly merged group of changes, to match
* the recorded position in the other file.
*/
- while (ixref < ix) {
- rchg[--ixs] = 1;
- rchg[--ix] = 0;
- while (rchgo[--ixo]);
+ while (ixref < i) {
+ rchg[--start] = 1;
+ rchg[--i] = 0;
+ while (rchgo[--io]);
}
/*
@@ -523,11 +523,11 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
* in the earlier loop, we need to shift it back only if at all.
*/
if ((flags & XDF_COMPACTION_HEURISTIC) && blank_lines) {
- while (ixs > 0 &&
- !is_blank_line(recs, ix - 1, flags) &&
- recs_match(recs, ixs - 1, ix - 1, flags)) {
- rchg[--ixs] = 1;
- rchg[--ix] = 0;
+ while (start > 0 &&
+ !is_blank_line(recs, i - 1, flags) &&
+ recs_match(recs, start - 1, i - 1, flags)) {
+ rchg[--start] = 1;
+ rchg[--i] = 0;
}
}
}
--
2.8.1
Michael Haggerty <mhagger@alum.mit.edu>