Author: avg
Date: Mon Nov 17 13:26:28 2014
New Revision: 274622
URL: https://svnweb.freebsd.org/changeset/base/274622
Log:
MFC r272701: make userland __assfail from opensolaris compat honor 'aok'
variable
Modified:
stable/9/sys/cddl/compat/opensolaris/sys/assfail.h
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/cddl/compat/opensolaris/sys/assfail.h
==============================================================================
--- stable/9/sys/cddl/compat/opensolaris/sys/assfail.h Mon Nov 17 12:36:01
2014 (r274621)
+++ stable/9/sys/cddl/compat/opensolaris/sys/assfail.h Mon Nov 17 13:26:28
2014 (r274622)
@@ -46,20 +46,24 @@ void assfail3(const char *, uintmax_t, c
#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 l
(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
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
