Changeset 1398 for trunk/dll/errutil.c

Timestamp:

Feb 21, 2009, 6:43:00 PM (16 years ago)

Author:

Gregg Young

Message:

Move embeded strings to PCSZ variables or string table; Eliminate Error2 functions Runtime_Error with NULL format string returns "No data" error. Change declares from PSZ to PCSZ in functions where the variable isn't changed. Added btm as an executable file type in several additional places. Use fProtectOnly to prevent attempt to execute Dos and Win programs on "Protect only" installs in several additional places.

File:

• trunk/dll/errutil.c (modified) (5 diffs)

trunk/dll/errutil.c

@@ -49 +49 @@
 #include "fm3str.h"
 #include "notebook.h"                   // fErrorBeepOff
+#include "init.h"                       // Data declares
 
 #pragma data_seg(GLOBAL2)
@@ -295 +296 @@
 
 //== Runtime_Error: report runtime library error using passed message string ===
+//If pszFmt is NULL a No Data error message is returned GKY 20 Feb 09 (Replaces Runtime_Error2)
 
 VOID Runtime_Error(PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...)
@@ -302 +304 @@
 
   // Format caller's message
+  if (!pszFmt)
+    pszFmt = PCSZ_NODATA;
   va_start(va, pszFmt);
   szMsg[sizeof(szMsg) - 1] = 0;
@@ -326 +330 @@
 //== Runtime_Error2: report runtime library error using passed message id ===
 
-VOID Runtime_Error2(PCSZ pszSrcFile, UINT uSrcLineNo, UINT idMsg)
+/*VOID Runtime_Error2(PCSZ pszSrcFile, UINT uSrcLineNo, UINT idMsg)
 {
   Runtime_Error(pszSrcFile, uSrcLineNo, GetPString(idMsg));
@@ -332 +336 @@
 } // Runtime_Error2
 
-// fixme to be rename to Misc_Error
+// fixme to be rename to Misc_Error */
 
 //=== saymsg: report misc error using passed message ===