commit - db33008019148e836335b567f0f5be5e757f2bdb
commit + 9d4a5e899df48f7da001cde629f33a3de43b6092
blob - 37bbc98ef1a3e514c30ba88ee113d02ee54c4f8d
blob + cf6d63f3c99259f41d9ce86ea31729a929aead0c
--- lib/diff3.c
+++ lib/diff3.c
skip(int *nskipped, int i, int from, struct diff3_state *d3s)
{
const struct got_error *err = NULL;
- size_t j, n;
+ size_t len, n;
char *line;
*nskipped = 0;
- for (n = 0; d3s->cline[i] < from - 1; n += j) {
- err = get_line(&line, d3s->fp[i], &j, d3s);
+ for (n = 0; d3s->cline[i] < from - 1; n += len) {
+ err = get_line(&line, d3s->fp[i], &len, d3s);
if (err)
return err;
d3s->cline[i]++;