ident.c: use warning_errno()
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
d2e255eefa
commit
a26f4ed682
8
ident.c
8
ident.c
|
@ -75,14 +75,12 @@ static int add_mailname_host(struct strbuf *buf)
|
||||||
mailname = fopen("/etc/mailname", "r");
|
mailname = fopen("/etc/mailname", "r");
|
||||||
if (!mailname) {
|
if (!mailname) {
|
||||||
if (errno != ENOENT)
|
if (errno != ENOENT)
|
||||||
warning("cannot open /etc/mailname: %s",
|
warning_errno("cannot open /etc/mailname");
|
||||||
strerror(errno));
|
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (strbuf_getline(&mailnamebuf, mailname) == EOF) {
|
if (strbuf_getline(&mailnamebuf, mailname) == EOF) {
|
||||||
if (ferror(mailname))
|
if (ferror(mailname))
|
||||||
warning("cannot read /etc/mailname: %s",
|
warning_errno("cannot read /etc/mailname");
|
||||||
strerror(errno));
|
|
||||||
strbuf_release(&mailnamebuf);
|
strbuf_release(&mailnamebuf);
|
||||||
fclose(mailname);
|
fclose(mailname);
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -125,7 +123,7 @@ static void add_domainname(struct strbuf *out, int *is_bogus)
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
|
|
||||||
if (gethostname(buf, sizeof(buf))) {
|
if (gethostname(buf, sizeof(buf))) {
|
||||||
warning("cannot get host name: %s", strerror(errno));
|
warning_errno("cannot get host name");
|
||||||
strbuf_addstr(out, "(none)");
|
strbuf_addstr(out, "(none)");
|
||||||
*is_bogus = 1;
|
*is_bogus = 1;
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue