undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/merge-file.c: use error_errno()

Browse Source 
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:
Nguyễn Thái Ngọc Duy 2016-05-08 16:47:29 +07:00 committed by Junio C Hamano
parent 880c0aef0f
commit 62f94d54a9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/merge-file.c
View File

@ -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);
} }