Changeset 1313

Timestamp:

Mar 16, 2004, 4:55:24 AM (21 years ago)

Author:

bird

Message:

LIBC_STRICT_DISABLED and missing writes.

File:

• trunk/src/emx/src/lib/sys/logstrict.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/lib/sys/logstrict.c

@@ -824 +824 @@
                           const char *pszFormat, ...)
 {
+    static int      fEnabled = -1;
     unsigned        uTS = getTimestamp();
     char           *pszMsg;
@@ -833 +834 @@
 
     /*
+     * Check if strict is enabled or not.
+     * Disabled when LIBC_STRICT_DISABLED is present.
+     */
+    if (fEnabled == -1)
+    {
+        PSZ pszValue;
+        fEnabled = DosScanEnv((PCSZ)"LIBC_STRICT_DISABLED", &pszValue) != NO_ERROR;
+    }
+
+    /*
      * Check instance, get default.
      */
@@ -871 +882 @@
     va_start(args, pszFormat);          /* make compiler happy we do it here. */
     cch = __libc_logBuildMsg(pszMsg, "", args, "%08x %02x %04x Asrt: Assertion Failed!!!\n", uTS, getTid(), __LIBC_LOG_GETGROUP(fGroupAndFlags));
-    DosWrite(2, pszMsg, cch, &cb);
+    __libc_logWrite(pInst, fGroupAndFlags, pszMsg, cch);
+    if (fEnabled)
+        DosWrite(2, pszMsg, cch, &cb);
+
     cch = __libc_logBuildMsg(pszMsg, "", args, "%08x %02x %04x Asrt: Function: %s\n", uTS, getTid(), __LIBC_LOG_GETGROUP(fGroupAndFlags), pszFunction);
-    DosWrite(2, pszMsg, cch, &cb);
+    __libc_logWrite(pInst, fGroupAndFlags, pszMsg, cch);
+    if (fEnabled)
+        DosWrite(2, pszMsg, cch, &cb);
+
     cch = __libc_logBuildMsg(pszMsg, "", args, "%08x %02x %04x Asrt: File:     %s\n", uTS, getTid(), __LIBC_LOG_GETGROUP(fGroupAndFlags), pszFile);
-    DosWrite(2, pszMsg, cch, &cb);
+    __libc_logWrite(pInst, fGroupAndFlags, pszMsg, cch);
+    if (fEnabled)
+        DosWrite(2, pszMsg, cch, &cb);
+
     cch = __libc_logBuildMsg(pszMsg, "", args, "%08x %02x %04x Asrt: Line:     %d\n", uTS, getTid(), __LIBC_LOG_GETGROUP(fGroupAndFlags), uLine);
-    DosWrite(2, pszMsg, cch, &cb);
+    __libc_logWrite(pInst, fGroupAndFlags, pszMsg, cch);
+    if (fEnabled)
+        DosWrite(2, pszMsg, cch, &cb);
+
     cch = __libc_logBuildMsg(pszMsg, "", args, "%08x %02x %04x Asrt: Expr:     %s\n", uTS, getTid(), __LIBC_LOG_GETGROUP(fGroupAndFlags), pszExpression);
-    DosWrite(2, pszMsg, cch, &cb);
+    __libc_logWrite(pInst, fGroupAndFlags, pszMsg, cch);
+    if (fEnabled)
+        DosWrite(2, pszMsg, cch, &cb);
+
     cch = __libc_logBuildMsg(pszMsg, pszFormat, args, "%08x %02x %04x Asrt: ",
                              uTS, getTid(), __LIBC_LOG_GETGROUP(fGroupAndFlags));
+    __libc_logWrite(pInst, fGroupAndFlags, pszMsg, cch);
+    if (fEnabled)
+        DosWrite(2, pszMsg, cch, &cb);
     va_end(args);
 
     /*
-     * Write the message.
-     */
-    __libc_logWrite(pInst, fGroupAndFlags, pszMsg, cch);
-
-    __asm__ __volatile__("int $3");
+     * Breakpoint. (IBM debugger: T or Ctrl-T to get to caller)
+     */
+    if (fEnabled)
+        __asm__ __volatile__("int $3");
 }