X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsupport%2Fsyserror.cpp;h=6d0900dcda89511de3eb3c7c3286246bb7ce78b1;hb=9bf016234cd06857e8d98cc1170cad7a42f0e45e;hp=b5981b1c16fd7f5928706370516c7a5701dab844;hpb=5cf6874680f80d238bf34535d711dc223813f951;p=ctsim.git diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp index b5981b1..6d0900d 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.6 2000/09/07 04:31:41 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 #include #include -#include "kstddef.h" -#include "cio.h" +#include "ctsupport.h" /* NAME @@ -59,7 +58,7 @@ 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) { @@ -67,7 +66,7 @@ void sys_verror (int severity, const char *msg, va_list arg) 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 << "*** 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; @@ -86,11 +85,16 @@ void sys_verror (int severity, const char *msg, va_list arg) cout << "WARNING ERROR: "; break; default: - sys_error (ERR_FATAL, "illegal error code #%d [sys_error]", severity); + cout << "Illegal error code #" << severity << ": "; } char errStr[512]; +#if HAVE_VSNPRINTF vsnprintf (errStr, sizeof(errStr), msg, arg); +#elif HAVE_VSPRINTF + vsprintf (errStr, msg, arg); +#endif + cout << errStr << endl; if (severity == ERR_FATAL)