Changeset 25528 in vbox for trunk/src/VBox/Runtime/r0drv/freebsd

Timestamp:

Dec 20, 2009 11:24:59 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56201

Message:

IPRT,SUPDrv,++: AssertMsg[12] -> AssertMsg1Weak, AssertMsg1, AssertMsg2Weak, AssertMsg2, AssertMsg2WeakV and AssertMsg2V. Doing more of the assertion machinery in common/misc/assert.cpp to avoid code duplication (ring-0). Major SUPDrv version bump.

File:

• trunk/src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c

@@ -39 +39 @@
 #include <iprt/stdarg.h>
 
+#include "internal/assert.h"
 
-RTDECL(void) AssertMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
+
+void rtR0AssertNativeMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
 {
-#ifdef IN_GUEST_R0
-    RTLogBackdoorPrintf("\n!!Assertion Failed!!\n"
-                        "Expression: %s\n"
-                        "Location  : %s(%d) %s\n",
-                        pszExpr, pszFile, uLine, pszFunction);
-#endif
-
     printf("\r\n!!Assertion Failed!!\r\n"
            "Expression: %s\r\n"
@@ -56 +51 @@
 
 
-RTDECL(void) AssertMsg2(const char *pszFormat, ...)
+void rtR0AssertNativeMsg2V(const char *pszFormat, va_list va)
 {
-    va_list va;
-    char    szMsg[256];
-
-#ifdef IN_GUEST_R0
-    va_start(va, pszFormat);
-    RTLogBackdoorPrintfV(pszFormat, va);
-    va_end(va);
-#endif
+    char szMsg[256];
 
     va_start(va, pszFormat);