diff options
| author | avg <avg@FreeBSD.org> | 2014-10-07 14:15:50 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2014-10-07 14:15:50 +0000 |
| commit | 073bd9bd13425e6588e77bb94607bc4fea41ba02 (patch) | |
| tree | 11cf3a17b7e71365134d2847cfd5b8c621eadc84 | |
| parent | ea6fd7eaaf413e0f30b10ba5b9cd0846185e7400 (diff) | |
| download | FreeBSD-src-073bd9bd13425e6588e77bb94607bc4fea41ba02.zip FreeBSD-src-073bd9bd13425e6588e77bb94607bc4fea41ba02.tar.gz | |
make userland __assfail from opensolaris compat honor 'aok' variable
This should allow zdb -A option to actually make difference.
MFC after: 2 weeks
| -rw-r--r-- | sys/cddl/compat/opensolaris/sys/assfail.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/cddl/compat/opensolaris/sys/assfail.h b/sys/cddl/compat/opensolaris/sys/assfail.h index e6ff258..553da69 100644 --- a/sys/cddl/compat/opensolaris/sys/assfail.h +++ b/sys/cddl/compat/opensolaris/sys/assfail.h @@ -46,20 +46,24 @@ void assfail3(const char *, uintmax_t, const char *, uintmax_t, const char *, #else /* !defined(_KERNEL) */ #ifndef HAVE_ASSFAIL +extern int aok; + static __inline int __assfail(const char *expr, const char *file, int line) { (void)fprintf(stderr, "Assertion failed: (%s), file %s, line %d.\n", expr, file, line); - abort(); - /* NOTREACHED */ + if (!aok) + abort(); return (0); } #define assfail __assfail #endif #ifndef HAVE_ASSFAIL3 +extern int aok; + static __inline void __assfail3(const char *expr, uintmax_t lv, const char *op, uintmax_t rv, const char *file, int line) { @@ -67,8 +71,8 @@ __assfail3(const char *expr, uintmax_t lv, const char *op, uintmax_t rv, (void)fprintf(stderr, "Assertion failed: %s (0x%jx %s 0x%jx), file %s, line %d.\n", expr, lv, op, rv, file, line); - abort(); - /* NOTREACHED */ + if (!aok) + abort(); } #define assfail3 __assfail3 #endif |
