builtin/merge-file.c: use error_errno()
All these error() calls do not print error message previously, but because when they are called, errno should be set. Use error_errno() instead to give more information. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
May 8, 2016 at 16:47 UTC
62f94d54a98983a19cc9dc82daec5c76df466b0b
1 file changed
+5
-5
builtin/merge-file.c
+5
-5
@@ -62,8 +62,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
62
usage_with_options(merge_file_usage, options);
63
if (quiet) {
64
if (!freopen("/dev/null", "w", stderr))
65
- return error("failed to redirect stderr to /dev/null: "
66
- "%s", strerror(errno));
65
+ return error_errno("failed to redirect stderr to /dev/null");
66
}
67
68
if (prefix)
@@ -95,12 +94,13 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
94
FILE *f = to_stdout ? stdout : fopen(fpath, "wb");
95
96
if (!f)
98
- ret = error("Could not open %s for writing", filename);
97
+ ret = error_errno("Could not open %s for writing",
98
+ filename);
99
else if (result.size &&
100
fwrite(result.ptr, result.size, 1, f) != 1)
101
- ret = error("Could not write to %s", filename);
101
+ ret = error_errno("Could not write to %s", filename);
102
else if (fclose(f))
103
- ret = error("Could not close %s", filename);
103
+ ret = error_errno("Could not close %s", filename);
104
free(result.ptr);
105
}
106