diff options
author | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2016-03-15 11:03:45 +0000 |
---|---|---|
committer | Edward Tomasz Napierala <trasz@FreeBSD.org> | 2016-03-15 11:03:45 +0000 |
commit | e19462c33b6d49009f26d8f8b86d53104b6a788f (patch) | |
tree | 885a41b8d3e0a8e5cbf7f21c6dfa5b0f4aa1c927 /usr.sbin/autofs | |
parent | 7e53dd7474603af11edb4420fda76dd5011e58eb (diff) | |
download | src-e19462c33b6d49009f26d8f8b86d53104b6a788f.tar.gz src-e19462c33b6d49009f26d8f8b86d53104b6a788f.zip |
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
Notes
Notes:
svn path=/head/; revision=296897
Diffstat (limited to 'usr.sbin/autofs')
-rw-r--r-- | usr.sbin/autofs/log.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/usr.sbin/autofs/log.c b/usr.sbin/autofs/log.c index d5682cc7263f..b3935dc0ed01 100644 --- a/usr.sbin/autofs/log.c +++ b/usr.sbin/autofs/log.c @@ -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_strvised[MSGBUF_LEN * 4 + 1]; + char *errstr; int ret; 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 { + errstr = strerror(log_errno); + if (peer_name != NULL) { 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", - peer_addr, peer_name, msgbuf_strvised, strerror(errno)); + peer_addr, peer_name, msgbuf_strvised, errstr); } else if (peer_addr != NULL) { fprintf(stderr, "%s: %s: %s: %s\n", getprogname(), - peer_addr, msgbuf_strvised, strerror(errno)); + peer_addr, msgbuf_strvised, errstr); syslog(priority, "%s: %s: %s", - peer_addr, msgbuf_strvised, strerror(errno)); + peer_addr, msgbuf_strvised, errstr); } else { fprintf(stderr, "%s: %s: %s\n", getprogname(), - msgbuf_strvised, strerror(errno)); + msgbuf_strvised, errstr); syslog(priority, "%s: %s", - msgbuf_strvised, strerror(errno)); + msgbuf_strvised, errstr); } } } |