diff options
author | avg <avg@FreeBSD.org> | 2017-10-13 09:10:37 +0000 |
---|---|---|
committer | avg <avg@FreeBSD.org> | 2017-10-13 09:10:37 +0000 |
commit | 8a1f0d74171d8e3f7a81e7baafa03decdaeaeb61 (patch) | |
tree | bef65d5a7dc3710892a35960dbd231700e96bf48 /cddl | |
parent | 52064f8cbf1233e6c15c20952cdffba216547da4 (diff) | |
download | FreeBSD-src-8a1f0d74171d8e3f7a81e7baafa03decdaeaeb61.zip FreeBSD-src-8a1f0d74171d8e3f7a81e7baafa03decdaeaeb61.tar.gz |
MFC r323528: MFV r323527: 5815 libzpool's panic function doesn't set global panicstr
Diffstat (limited to 'cddl')
-rw-r--r-- | cddl/contrib/opensolaris/lib/libzpool/common/kernel.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c index 701f0b4..ab1b839 100644 --- a/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c +++ b/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c @@ -735,11 +735,9 @@ static char ce_suffix[CE_IGNORE][2] = { "", "\n", "\n", "" }; void vpanic(const char *fmt, va_list adx) { - (void) fprintf(stderr, "error: "); - (void) vfprintf(stderr, fmt, adx); - (void) fprintf(stderr, "\n"); - - abort(); /* think of it as a "user-level crash dump" */ + char buf[512]; + (void) vsnprintf(buf, 512, fmt, adx); + assfail(buf, NULL, 0); } void |