diff: restyle loop a bit
This is a bit more readable, and this loop is probably unlikely to gain any `continue` or `break`s. Suggested by: pstef Differential Revision: https://reviews.freebsd.org/D37676
This commit is contained in:
parent
8bf187f35b
commit
54d65fdd56
@ -1246,9 +1246,9 @@ fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile, int flags)
|
|||||||
else if (diff_format != D_UNIFIED)
|
else if (diff_format != D_UNIFIED)
|
||||||
printf(" ");
|
printf(" ");
|
||||||
}
|
}
|
||||||
col = 0;
|
col = j = 0;
|
||||||
for (j = 0, lastc = '\0'; j < nc && (hw == 0 || col < hw);
|
lastc = '\0';
|
||||||
j++, lastc = c) {
|
while (j < nc && (hw == 0 || col < hw)) {
|
||||||
c = getc(lb);
|
c = getc(lb);
|
||||||
if (flags & D_STRIPCR && c == '\r') {
|
if (flags & D_STRIPCR && c == '\r') {
|
||||||
if ((c = getc(lb)) == '\n')
|
if ((c = getc(lb)) == '\n')
|
||||||
@ -1313,6 +1313,9 @@ fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile, int flags)
|
|||||||
col++;
|
col++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
j++;
|
||||||
|
lastc = c;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (color && diff_format == D_SIDEBYSIDE)
|
if (color && diff_format == D_SIDEBYSIDE)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user