talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the log_errno value passed to the function instead of the errno global 

variable.

Suggested by:	Daniel Braniss
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Edward Tomasz Napierala 2016-03-15 11:03:45 +00:00
parent 7e53dd7474
commit e19462c33b
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.sbin/autofs/log.c
View File

@ -88,6 +88,7 @@ log_common(int priority, int log_errno, const char *fmt, va_list ap)
{ {
static char msgbuf[MSGBUF_LEN]; static char msgbuf[MSGBUF_LEN];
static char msgbuf_strvised[MSGBUF_LEN * 4 + 1]; static char msgbuf_strvised[MSGBUF_LEN * 4 + 1];
char *errstr;
int ret; int ret;
ret = vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap); ret = vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap);
@ -121,21 +122,23 @@ log_common(int priority, int log_errno, const char *fmt, va_list ap)
} }
} else { } else {
errstr = strerror(log_errno);
if (peer_name != NULL) { if (peer_name != NULL) {
fprintf(stderr, "%s: %s (%s): %s: %s\n", getprogname(), fprintf(stderr, "%s: %s (%s): %s: %s\n", getprogname(),
peer_addr, peer_name, msgbuf_strvised, strerror(errno)); peer_addr, peer_name, msgbuf_strvised, errstr);
syslog(priority, "%s (%s): %s: %s", syslog(priority, "%s (%s): %s: %s",
peer_addr, peer_name, msgbuf_strvised, strerror(errno)); peer_addr, peer_name, msgbuf_strvised, errstr);
} else if (peer_addr != NULL) { } else if (peer_addr != NULL) {
fprintf(stderr, "%s: %s: %s: %s\n", getprogname(), fprintf(stderr, "%s: %s: %s: %s\n", getprogname(),
peer_addr, msgbuf_strvised, strerror(errno)); peer_addr, msgbuf_strvised, errstr);
syslog(priority, "%s: %s: %s", syslog(priority, "%s: %s: %s",
peer_addr, msgbuf_strvised, strerror(errno)); peer_addr, msgbuf_strvised, errstr);
} else { } else {
fprintf(stderr, "%s: %s: %s\n", getprogname(), fprintf(stderr, "%s: %s: %s\n", getprogname(),
msgbuf_strvised, strerror(errno)); msgbuf_strvised, errstr);
syslog(priority, "%s: %s", syslog(priority, "%s: %s",
msgbuf_strvised, strerror(errno)); msgbuf_strvised, errstr);
} }
} }
} }

15
usr.sbin/ctld/log.c
View File

@ -88,6 +88,7 @@ log_common(int priority, int log_errno, const char *fmt, va_list ap)
{ {
static char msgbuf[MSGBUF_LEN]; static char msgbuf[MSGBUF_LEN];
static char msgbuf_strvised[MSGBUF_LEN * 4 + 1]; static char msgbuf_strvised[MSGBUF_LEN * 4 + 1];
char *errstr;
int ret; int ret;
ret = vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap); ret = vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap);
@ -121,21 +122,23 @@ log_common(int priority, int log_errno, const char *fmt, va_list ap)
} }
} else { } else {
errstr = strerror(log_errno);
if (peer_name != NULL) { if (peer_name != NULL) {
fprintf(stderr, "%s: %s (%s): %s: %s\n", getprogname(), fprintf(stderr, "%s: %s (%s): %s: %s\n", getprogname(),
peer_addr, peer_name, msgbuf_strvised, strerror(errno)); peer_addr, peer_name, msgbuf_strvised, errstr);
syslog(priority, "%s (%s): %s: %s", syslog(priority, "%s (%s): %s: %s",
peer_addr, peer_name, msgbuf_strvised, strerror(errno)); peer_addr, peer_name, msgbuf_strvised, errstr);
} else if (peer_addr != NULL) { } else if (peer_addr != NULL) {
fprintf(stderr, "%s: %s: %s: %s\n", getprogname(), fprintf(stderr, "%s: %s: %s: %s\n", getprogname(),
peer_addr, msgbuf_strvised, strerror(errno)); peer_addr, msgbuf_strvised, errstr);
syslog(priority, "%s: %s: %s", syslog(priority, "%s: %s: %s",
peer_addr, msgbuf_strvised, strerror(errno)); peer_addr, msgbuf_strvised, errstr);
} else { } else {
fprintf(stderr, "%s: %s: %s\n", getprogname(), fprintf(stderr, "%s: %s: %s\n", getprogname(),
msgbuf_strvised, strerror(errno)); msgbuf_strvised, errstr);
syslog(priority, "%s: %s", syslog(priority, "%s: %s",
msgbuf_strvised, strerror(errno)); msgbuf_strvised, errstr);
} }
} }
} }

15
usr.sbin/iscsid/log.c
View File

@ -88,6 +88,7 @@ log_common(int priority, int log_errno, const char *fmt, va_list ap)
{ {
static char msgbuf[MSGBUF_LEN]; static char msgbuf[MSGBUF_LEN];
static char msgbuf_strvised[MSGBUF_LEN * 4 + 1]; static char msgbuf_strvised[MSGBUF_LEN * 4 + 1];
char *errstr;
int ret; int ret;
ret = vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap); ret = vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap);
@ -121,21 +122,23 @@ log_common(int priority, int log_errno, const char *fmt, va_list ap)
} }
} else { } else {
errstr = strerror(log_errno);
if (peer_name != NULL) { if (peer_name != NULL) {
fprintf(stderr, "%s: %s (%s): %s: %s\n", getprogname(), fprintf(stderr, "%s: %s (%s): %s: %s\n", getprogname(),
peer_addr, peer_name, msgbuf_strvised, strerror(errno)); peer_addr, peer_name, msgbuf_strvised, errstr);
syslog(priority, "%s (%s): %s: %s", syslog(priority, "%s (%s): %s: %s",
peer_addr, peer_name, msgbuf_strvised, strerror(errno)); peer_addr, peer_name, msgbuf_strvised, errstr);
} else if (peer_addr != NULL) { } else if (peer_addr != NULL) {
fprintf(stderr, "%s: %s: %s: %s\n", getprogname(), fprintf(stderr, "%s: %s: %s: %s\n", getprogname(),
peer_addr, msgbuf_strvised, strerror(errno)); peer_addr, msgbuf_strvised, errstr);
syslog(priority, "%s: %s: %s", syslog(priority, "%s: %s: %s",
peer_addr, msgbuf_strvised, strerror(errno)); peer_addr, msgbuf_strvised, errstr);
} else { } else {
fprintf(stderr, "%s: %s: %s\n", getprogname(), fprintf(stderr, "%s: %s: %s\n", getprogname(),
msgbuf_strvised, strerror(errno)); msgbuf_strvised, errstr);
syslog(priority, "%s: %s", syslog(priority, "%s: %s",
msgbuf_strvised, strerror(errno)); msgbuf_strvised, errstr);
} }
} }
} }