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:
8
ident.c
8
ident.c
@ -75,14 +75,12 @@ static int add_mailname_host(struct strbuf *buf)
|
||||
mailname = fopen("/etc/mailname", "r");
|
||||
if (!mailname) {
|
||||
if (errno != ENOENT)
|
||||
warning("cannot open /etc/mailname: %s",
|
||||
strerror(errno));
|
||||
warning_errno("cannot open /etc/mailname");
|
||||
return -1;
|
||||
}
|
||||
if (strbuf_getline(&mailnamebuf, mailname) == EOF) {
|
||||
if (ferror(mailname))
|
||||
warning("cannot read /etc/mailname: %s",
|
||||
strerror(errno));
|
||||
warning_errno("cannot read /etc/mailname");
|
||||
strbuf_release(&mailnamebuf);
|
||||
fclose(mailname);
|
||||
return -1;
|
||||
@ -125,7 +123,7 @@ static void add_domainname(struct strbuf *out, int *is_bogus)
|
||||
char buf[1024];
|
||||
|
||||
if (gethostname(buf, sizeof(buf))) {
|
||||
warning("cannot get host name: %s", strerror(errno));
|
||||
warning_errno("cannot get host name");
|
||||
strbuf_addstr(out, "(none)");
|
||||
*is_bogus = 1;
|
||||
return;
|
||||
|
Reference in New Issue
Block a user