commit - 9d4a5e899df48f7da001cde629f33a3de43b6092
commit + 9688d20ad63057dfb1047a7c31d629b07d92618b
blob - cf6d63f3c99259f41d9ce86ea31729a929aead0c
blob + c22d2b2d0f7b76684ab000e8bb2dd476e725bc08
--- lib/diff3.c
+++ lib/diff3.c
edscript(int n, struct diff3_state *d3s)
{
const struct got_error *err = NULL;
- int j, k;
+ int len, k;
char block[BUFSIZ+1];
for (; n > 0; n--) {
== -1)
return got_error_from_errno("fseek");
k = d3s->de[n].new.to - d3s->de[n].new.from;
- for (; k > 0; k -= j) {
- j = k > BUFSIZ ? BUFSIZ : k;
- if (fread(block, 1, j, d3s->fp[2]) != (size_t)j)
+ for (; k > 0; k -= len) {
+ len = k > BUFSIZ ? BUFSIZ : k;
+ if (fread(block, 1, len, d3s->fp[2]) != (size_t)len)
return got_ferror(d3s->fp[2], GOT_ERR_IO);
- block[j] = '\0';
+ block[len] = '\0';
err = diff_output(d3s->diffbuf, "%s", block);
if (err)
return err;