commit - 50351dee7e55367d42b3a715d56abdd7751978cd
commit + 971405a7e47997a87d869bc30b3fca98083395dc
blob - 8209ffc7c20dc49e954d45dd67fc92248379c3f8
blob + 55321254697fa7c93407f495fdae6fe53a5efc06
--- lib/diff3.c
+++ lib/diff3.c
readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
{
const struct got_error *err = NULL;
+ FILE *f;
int a, b, c, d;
char kind, *p;
size_t i;
*n = 0;
- d3s->fp[0] = fopen(name, "r");
- if (d3s->fp[0] == NULL)
+ f = fopen(name, "r");
+ if (f == NULL)
return got_error_from_errno2("fopen", name);
- err = getchange(&p, d3s->fp[0], d3s);
+ err = getchange(&p, f, d3s);
if (err)
return err;
for (i = 0; p; i++) {
(*dd)[i].new.from = c;
(*dd)[i].new.to = d;
- err = getchange(&p, d3s->fp[0], d3s);
+ err = getchange(&p, f, d3s);
if (err)
return err;
}
(*dd)[i].new.from = (*dd)[i - 1].new.to;
}
- if (fclose(d3s->fp[0]) != 0)
+ if (fclose(f) != 0)
err = got_error_from_errno("fclose");
*n = i;