rerere.c: move error_errno() closer to the source system call

pclouds · gitster · commit f7566f073fcc · 2017-05-26T12:33:56.000+09:00
We are supposed to report errno from fopen(). fclose() between fopen()
and the report function could either change errno or reset it.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/rerere.c b/rerere.c
@@ -489,8 +489,9 @@ static int handle_file(const char *path, unsigned char *sha1, const char *output
 	if (output) {
 		io.io.output = fopen(output, "w");
 		if (!io.io.output) {
+			error_errno("Could not write %s", output);
 			fclose(io.input);
-			return error_errno("Could not write %s", output);
+			return -1;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -489,8 +489,9 @@ static int handle_file(const char path, unsigned char sha1, const char *output`
`489`	`489`	`if (output) {`
`490`	`490`	`io.io.output = fopen(output, "w");`
`491`	`491`	`if (!io.io.output) {`
	`492`	`+ error_errno("Could not write %s", output);`
`492`	`493`	`fclose(io.input);`
`493`		`- return error_errno("Could not write %s", output);`
	`494`	`+ return -1;`
`494`	`495`	`}`
`495`	`496`	`}`
`496`	`497`