Changeset 229 for trunk/src/helpers/except.c

Timestamp:

Nov 24, 2002, 9:45:05 PM (23 years ago)

Author:

umoeller

Message:

Sources as of 1.0.0.

File:

• trunk/src/helpers/except.c (modified) (12 diffs)

trunk/src/helpers/except.c

@@ -451 +451 @@
  *@@changed V0.9.16 (2001-11-02) [pr]: make object display signed
  *@@changed V0.9.19 (2002-03-28) [umoeller]: added thread ordinal
- *@@changed V0.9.21 (2002-08-28) [umoeller]: added OS revision to dump
+ *@@changed V1.0.0 (2002-08-28) [umoeller]: added OS revision to dump
  */
 
@@ -508 +508 @@
     // generic exception info
     DosQuerySysInfo(QSV_VERSION_MAJOR,      // 11
-                    QSV_VERSION_REVISION,   // 13 V0.9.21 (2002-08-28) [umoeller]
+                    QSV_VERSION_REVISION,   // 13 V1.0.0 (2002-08-28) [umoeller]
                     &aulBuf, sizeof(aulBuf));
     // Warp 3 is reported as 20.30
@@ -527 +527 @@
             aulBuf[0],                      // major
             aulBuf[1],
-            aulBuf[2],              // revision V0.9.21 (2002-08-28) [umoeller]
+            aulBuf[2],              // revision V1.0.0 (2002-08-28) [umoeller]
             pcszVersion);
 
@@ -791 +791 @@
  *
  *      --  pfnExcOpenFileNew gets called to open
- *          the trap log file. This must return a FILE*
- *          pointer from fopen(). If this is not defined,
- *          ?:\TRAP.LOG is used. Use this to specify a
- *          different file and have some notes written
- *          into it before the actual exception info.
+ *          the trap log file. This can return a FILE*
+ *          pointer from fopen() (which will be closed
+ *          automatically by the handler).
+ *
+ *          If this hook is not defined, ?:\TRAP.LOG is
+ *          used. Use this hook to specify a different file
+ *          and have some notes written into it before the
+ *          actual exception info.
+ *
+ *          If the hook returns a null FILE* pointer,
+ *          logging is disabled, and the "loud" handler
+ *          effectively behaves like the "quiet" handler.
  *
  *      --  pfnExcHookNew gets called while the trap log
@@ -801 +808 @@
  *          the following info has been written into
  *          the trap log already:
+ *
  *          -- exception type/address block
+ *
  *          -- exception explanation
+ *
  *          -- process information
  *
@@ -890 +900 @@
 {
     /* From the VAC++3 docs:
-     *     "The first thing an exception handler should do is check the
-     *     exception flags. If EH_EXIT_UNWIND is set, meaning
-     *     the thread is ending, the handler tells the operating system
-     *     to pass the exception to the next exception handler. It does the
-     *     same if the EH_UNWINDING flag is set, the flag that indicates
-     *     this exception handler is being removed.
-     *     The EH_NESTED_CALL flag indicates whether the exception
-     *     occurred within an exception handler. If the handler does
-     *     not check this flag, recursive exceptions could occur until
-     *     there is no stack remaining."
-     * So for all these conditions, we exit immediately.
+     *      "The first thing an exception handler should do is check the
+     *      exception flags. If EH_EXIT_UNWIND is set, meaning
+     *      the thread is ending, the handler tells the operating system
+     *      to pass the exception to the next exception handler. It does the
+     *      same if the EH_UNWINDING flag is set, the flag that indicates
+     *      this exception handler is being removed.
+     *      The EH_NESTED_CALL flag indicates whether the exception
+     *      occurred within an exception handler. If the handler does
+     *      not check this flag, recursive exceptions could occur until
+     *      there is no stack remaining."
+     *
+     *      So for all these conditions, we exit immediately.
      */
 
     if (pReportRec->fHandlerFlags & EH_EXIT_UNWIND)
-       return (XCPT_CONTINUE_SEARCH);
+       return XCPT_CONTINUE_SEARCH;
     if (pReportRec->fHandlerFlags & EH_UNWINDING)
-       return (XCPT_CONTINUE_SEARCH);
+       return XCPT_CONTINUE_SEARCH;
     if (pReportRec->fHandlerFlags & EH_NESTED_CALL)
-       return (XCPT_CONTINUE_SEARCH);
+       return XCPT_CONTINUE_SEARCH;
 
     switch (pReportRec->ExceptionNum)
@@ -920 +931 @@
         {
             // "real" exceptions:
-            FILE *file;
+            FILE *file = NULL;
 
             // open traplog file;
             if (G_pfnExcOpenFile)
                 // hook defined for this: call it
-                file = (*G_pfnExcOpenFile)();
+                file = G_pfnExcOpenFile();
             else
             {
@@ -933 +944 @@
                 // boot drive
                 sprintf(szFileName, "%c:\\trap.log", doshQueryBootDrive());
-                file = fopen(szFileName, "a");
-
-                if (file)
+
+                if (file = fopen(szFileName, "a"))
                 {
                     DATETIME DT;
@@ -948 +958 @@
             }
 
-            // write error log
-            excExplainException(file,
-                                "excHandlerLoud",
-                                pReportRec,
-                                pContextRec);
-            fclose(file);
+            if (file)
+            {
+                // write error log
+                excExplainException(file,
+                                    "excHandlerLoud",
+                                    pReportRec,
+                                    pContextRec);
+                fclose(file);
+            }
 
             // copy report rec to user buffer
@@ -963 +976 @@
             // jump back to failing routine
             longjmp(pRegRec2->jmpThread, pReportRec->ExceptionNum);
-        break; }
+        }
+        break;
     }
 
     // not handled
-    return (XCPT_CONTINUE_SEARCH);
+    return XCPT_CONTINUE_SEARCH;
 }
 
@@ -997 +1011 @@
 {
     if (pReportRec->fHandlerFlags & EH_EXIT_UNWIND)
-       return (XCPT_CONTINUE_SEARCH);
+       return XCPT_CONTINUE_SEARCH;
     if (pReportRec->fHandlerFlags & EH_UNWINDING)
-       return (XCPT_CONTINUE_SEARCH);
+       return XCPT_CONTINUE_SEARCH;
     if (pReportRec->fHandlerFlags & EH_NESTED_CALL)
-       return (XCPT_CONTINUE_SEARCH);
+       return XCPT_CONTINUE_SEARCH;
 
     switch (pReportRec->ExceptionNum)
@@ -1033 +1047 @@
             longjmp(pRegRec2->jmpThread, pReportRec->ExceptionNum);
         break;
-
-        default:
-             break;
     }
 
-    return (XCPT_CONTINUE_SEARCH);
+    return XCPT_CONTINUE_SEARCH;
 }