Merge branch 'nd/error-errno'
The code for warning_errno/die_errno has been refactored and a new
error_errno() reporting helper is introduced.
* nd/error-errno: (41 commits)
wrapper.c: use warning_errno()
vcs-svn: use error_errno()
upload-pack.c: use error_errno()
unpack-trees.c: use error_errno()
transport-helper.c: use error_errno()
sha1_file.c: use {error,die,warning}_errno()
server-info.c: use error_errno()
sequencer.c: use error_errno()
run-command.c: use error_errno()
rerere.c: use error_errno() and warning_errno()
reachable.c: use error_errno()
mailmap.c: use error_errno()
ident.c: use warning_errno()
http.c: use error_errno() and warning_errno()
grep.c: use error_errno()
gpg-interface.c: use error_errno()
fast-import.c: use error_errno()
entry.c: use error_errno()
editor.c: use error_errno()
diff-no-index.c: use error_errno()
...
This commit is contained in:
@ -607,7 +607,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
|
||||
|
||||
fp = fopen(filename, "a");
|
||||
if (!fp)
|
||||
return error(_("cannot open %s: %s\n"), filename, strerror(errno));
|
||||
return error_errno(_("cannot open %s"), filename);
|
||||
|
||||
if (raw_url)
|
||||
url = transport_anonymize_url(raw_url);
|
||||
@ -848,7 +848,7 @@ static int truncate_fetch_head(void)
|
||||
FILE *fp = fopen_for_writing(filename);
|
||||
|
||||
if (!fp)
|
||||
return error(_("cannot open %s: %s\n"), filename, strerror(errno));
|
||||
return error_errno(_("cannot open %s"), filename);
|
||||
fclose(fp);
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user