mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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>
This commit is contained in:
parent
880c0aef0f
commit
62f94d54a9
|
@ -62,8 +62,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
|
||||||
usage_with_options(merge_file_usage, options);
|
usage_with_options(merge_file_usage, options);
|
||||||
if (quiet) {
|
if (quiet) {
|
||||||
if (!freopen("/dev/null", "w", stderr))
|
if (!freopen("/dev/null", "w", stderr))
|
||||||
return error("failed to redirect stderr to /dev/null: "
|
return error_errno("failed to redirect stderr to /dev/null");
|
||||||
"%s", strerror(errno));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prefix)
|
if (prefix)
|
||||||
|
@ -95,12 +94,13 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
|
||||||
FILE *f = to_stdout ? stdout : fopen(fpath, "wb");
|
FILE *f = to_stdout ? stdout : fopen(fpath, "wb");
|
||||||
|
|
||||||
if (!f)
|
if (!f)
|
||||||
ret = error("Could not open %s for writing", filename);
|
ret = error_errno("Could not open %s for writing",
|
||||||
|
filename);
|
||||||
else if (result.size &&
|
else if (result.size &&
|
||||||
fwrite(result.ptr, result.size, 1, f) != 1)
|
fwrite(result.ptr, result.size, 1, f) != 1)
|
||||||
ret = error("Could not write to %s", filename);
|
ret = error_errno("Could not write to %s", filename);
|
||||||
else if (fclose(f))
|
else if (fclose(f))
|
||||||
ret = error("Could not close %s", filename);
|
ret = error_errno("Could not close %s", filename);
|
||||||
free(result.ptr);
|
free(result.ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue