** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: syserror.cpp,v 1.11 2000/12/29 20:11:42 kevin Exp $
+** $Id: syserror.cpp,v 1.17 2001/01/19 22:29:15 kevin Exp $
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License (version 2) as
#include <exception>
#include <stdexcept>
#include <stdarg.h>
-#include <ctype.h>\r
+#include <ctype.h>
#include <string>
#include "ct.h"
+#ifdef HAVE_WXWINDOWS
+#include "../src/ctsim.h"
+#endif
/* NAME
* sys_error System error handler
*/
static int s_reportErrorLevel = ERR_WARNING; // Set error reporting level
-\r
-bool g_bRunningWXWindows = false;
+
void sys_error (int severity, const char *msg, ...)
{
va_list arg;
va_start(arg, msg);
- \r
+
std::string strOutput;
sys_verror (strOutput, severity, msg, arg);
- \r
-// if (g_bRunningWXWindows)\r
-// theApp->getLog() << strOutput.c_str();\r
-// else\r
- std::cout << strOutput;\r
+
+#ifdef HAVE_WXWINDOWS
+ if (g_bRunningWXWindows)
+ *theApp->getLog() << strOutput.c_str();
+ else
+#endif
+ std::cout << strOutput;
va_end(arg);
}
if (severity < s_reportErrorLevel)
return; // ignore error if less than reporting level
- std::ostringstream os;\r
+ std::ostringstream os;
- s_nErrorCount++;\r
+ s_nErrorCount++;
if (severity != ERR_FATAL) {
if (s_nErrorCount > MAX_ERROR_COUNT)
return;
os << "*** M A X I M U M E R R O R C O U N T R E A C H E D ***\n";
os << "*** ***\n";
os << "*** No further errors will be reported ***\n";
- os << "*****************************************************************\n";\r
+ os << "*****************************************************************\n";
strOutput = os.str();
return;
}
break;
case ERR_WARNING:
os << "WARNING ERROR: ";
- break;\r
- case ERR_TRACE:\r
- os << "Trace: ";\r
+ break;
+ case ERR_TRACE:
+ os << "Trace: ";
break;
default:
os << "Illegal error severity #" << severity << ": ";
}
- char errStr[2000];\r
+ char errStr[2000];
#if HAVE_VSNPRINTF
vsnprintf (errStr, sizeof(errStr), msg, arg);
#elif HAVE_VSPRINTF
- vsprintf (errStr, msg, arg);\r
-#else\r
+ vsprintf (errStr, msg, arg);
+#else
strncpy (errStr, sizeof(errStr), "Error message not available on this platform.");
#endif
os << errStr << "\n";
- strOutput = os.str();\r
+ strOutput = os.str();
- if (severity == ERR_FATAL)
- throw std::runtime_error (errStr);
+ if (severity == ERR_FATAL) {
+ std::cerr << strOutput;
+ throw std::runtime_error (strOutput);
+ }
#if INTERACTIVE_ERROR_DISPLAY
std::cout << "A - Abort C - Continue W - Turn off warnings? ";
{
if (severity == ERR_FATAL ||
severity == ERR_SEVERE ||
- severity == ERR_WARNING ||\r
+ severity == ERR_WARNING ||
severity == ERR_TRACE)
s_reportErrorLevel = severity;
else