Commit Diff

Commit:
abc6a33f6abdb9b7560fe12f4d32a2f7471ed81c
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
make readin() actually write to its output argument
Actions:
Patch | Tree
commit - 25d0340b7ef4cde52e87819c9bf54d65fe136a58
commit + abc6a33f6abdb9b7560fe12f4d32a2f7471ed81c
blob - f0f049301e08a5536778079b5efbbced9a1d3edf
blob + bd1d37e42b80fa95d9d086f1bc3cd05d17c4406b
--- lib/diff3.c
+++ lib/diff3.c
@@ -562,6 +562,8 @@ readin(size_t *n, char *name, struct diff **dd, struct
 	int a, b, c, d;
 	char kind, *p;
 	size_t i;
+
+	*n = 0;
 
 	d3s->fp[0] = fopen(name, "r");
 	if (d3s->fp[0] == NULL)
@@ -602,6 +604,7 @@ readin(size_t *n, char *name, struct diff **dd, struct
 
 	(void)fclose(d3s->fp[0]);
 
+	*n = i;
 	return NULL;
 }