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

opensolaris compat: fix vcmn_err so that panic(9) produces a proper message

Browse Source 
... instead of just a verbatim format string.

Reviewed by:	pjd
MFC after:	1 week
This commit is contained in:
Andriy Gapon 2011-12-19 14:55:14 +00:00
parent 6bd3e53514
commit 528bf6e40e
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c
View File

@ -28,29 +28,35 @@ void
vcmn_err(int ce, const char *fmt, va_list adx)
{
char buf[256];
const char *prefix;
prefix = NULL; /* silence unwitty compilers */
switch (ce) {
case CE_CONT:
snprintf(buf, sizeof(buf), "Solaris(cont): %s\n", fmt);
prefix = "Solaris(cont): ";
break;
case CE_NOTE:
snprintf(buf, sizeof(buf), "Solaris: NOTICE: %s\n", fmt);
prefix = "Solaris: NOTICE: ";
break;
case CE_WARN:
snprintf(buf, sizeof(buf), "Solaris: WARNING: %s\n", fmt);
prefix = "Solaris: WARNING: ";
break;
case CE_PANIC:
snprintf(buf, sizeof(buf), "Solaris(panic): %s\n", fmt);
prefix = "Solaris(panic): ";
break;
case CE_IGNORE:
break;
default:
panic("Solaris: unknown severity level");
}
if (ce == CE_PANIC)
panic("%s", buf);
if (ce != CE_IGNORE)
vprintf(buf, adx);
if (ce == CE_PANIC) {
vsnprintf(buf, sizeof(buf), fmt, adx);
panic("%s%s", prefix, buf);
}
if (ce != CE_IGNORE) {
printf("%s", prefix);
vprintf(fmt, adx);
}
}
void