X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsupport%2Fsyserror.cpp;h=06ee4eedbda42e77c43565d9d34847609666e1af;hp=b5981b1c16fd7f5928706370516c7a5701dab844;hb=ee0105d74fec9d6bfd236e22e9e1d315e46c568e;hpb=5cf6874680f80d238bf34535d711dc223813f951

diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp
index b5981b1..06ee4ee 100644
--- a/libctsupport/syserror.cpp
+++ b/libctsupport/syserror.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: syserror.cpp,v 1.2 2000/06/19 17:58:20 kevin Exp $
+**  $Id: syserror.cpp,v 1.7 2000/12/06 01:46:43 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
@@ -23,8 +23,7 @@
 #include <stdexcept>
 #include <stdarg.h>
 #include <ctype.h>
-#include "kstddef.h"
-#include "cio.h"
+#include "ctsupport.h"
 
 
 /* NAME
@@ -59,45 +58,50 @@ const static int MAX_ERROR_COUNT = 20;
 void sys_verror (int severity, const char *msg, va_list arg)
 {
   if (severity < errorlevel)
-    return;			/* ignore error if less than max level */
+    return;	// ignore error if less than max level
 
   nErrorCount++;
   if (severity != ERR_FATAL) {
     if (nErrorCount > MAX_ERROR_COUNT)
       return;
     else if (nErrorCount == MAX_ERROR_COUNT) {
-      cout << "*****************************************************************" << endl;
-      cout << "***     M A X I M U M  E R R O R  C O U N T  R E A C H E D    ***" << endl;
-      cout << "***                                                           ***" << endl;
-      cout << "***           No further errors will be reported              ***" << endl;
-      cout << "*****************************************************************" << endl;
+		std::cout << "*****************************************************************\n";
+		std::cout << "***   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";
+		std::cout << "***                                                           ***\n";
+		std::cout << "***           No further errors will be reported              ***\n";
+		std::cout << "*****************************************************************\n";
       return;
     }
   }
     
   switch (severity) {
   case ERR_FATAL:
-    cout << "FATAL ERROR: ";
+	  std::cout << "FATAL ERROR: ";
     break;
   case ERR_SEVERE:
-    cout << "SEVERE ERROR: ";
+	  std::cout << "SEVERE ERROR: ";
     break;
   case ERR_WARNING:
-    cout << "WARNING ERROR: ";
+	  std::cout << "WARNING ERROR: ";
     break;
   default:
-    sys_error (ERR_FATAL, "illegal error code #%d  [sys_error]", severity);
+	  std::cout << "Illegal error code #" << severity << ": ";
   }
   
   char errStr[512];
+#if HAVE_VSNPRINTF
   vsnprintf (errStr, sizeof(errStr), msg, arg);
-  cout << errStr << endl;
+#elif HAVE_VSPRINTF
+  vsprintf (errStr, msg, arg);
+#endif
+
+  std::cout << errStr << std::endl;
   
   if (severity == ERR_FATAL)
-    throw runtime_error (errStr);
+	  throw std::runtime_error (errStr);
   
 #if INTERACTIVE_ERROR_DISPLAY
-  cout << "A - Abort  C - Continue  W - Turn off warnings? ";
+  std::cout << "A - Abort  C - Continue  W - Turn off warnings? ";
   //  fflush(stderr);
   do 
    {