d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- don't print strerror() if errno == 0 on fatal().

Browse Source 
- va_start/end audit.
- can't use vfprintf() twice.  need va_start/end pair every time.

Obtained from:	KAME
MFC after:	1 week
This commit is contained in:
ume 2003-08-17 18:35:56 +00:00
parent f7ff921e4d
commit 6cbfc84504
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
usr.sbin/route6d/route6d.c
View File

@ -3335,10 +3335,13 @@ fatal(fmt, va_alist)
va_start(ap);
#endif
vsnprintf(buf, sizeof(buf), fmt, ap);
perror(buf);
syslog(LOG_ERR, "%s: %s", buf, strerror(errno));
rtdexit();
va_end(ap);
perror(buf);
if (errno)
syslog(LOG_ERR, "%s: %s", buf, strerror(errno));
else
syslog(LOG_ERR, "%s", buf);
rtdexit();
}
void
@ -3353,22 +3356,28 @@ tracet(level, fmt, va_alist)
{
va_list ap;
#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
#endif
if (level <= dflag) {
#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
#endif
fprintf(stderr, "%s: ", hms());
vfprintf(stderr, fmt, ap);
va_end(ap);
}
if (dflag) {
#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
#endif
if (level > 0)
vsyslog(LOG_DEBUG, fmt, ap);
else
vsyslog(LOG_WARNING, fmt, ap);
va_end(ap);
}
va_end(ap);
}
void
@ -3383,20 +3392,27 @@ trace(level, fmt, va_alist)
{
va_list ap;
if (level <= dflag) {
#ifdef __STDC__
va_start(ap, fmt);
va_start(ap, fmt);
#else
va_start(ap);
va_start(ap);
#endif
if (level <= dflag)
vfprintf(stderr, fmt, ap);
va_end(ap);
}
if (dflag) {
#ifdef __STDC__
va_start(ap, fmt);
#else
va_start(ap);
#endif
if (level > 0)
vsyslog(LOG_DEBUG, fmt, ap);
else
vsyslog(LOG_WARNING, fmt, ap);
va_end(ap);
}
va_end(ap);
}
unsigned int