r101: *** empty log message ***

[ctsim.git] / libctsupport / syserror.cpp

diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp
index dc3851cbbffb8507884ca8129ed7508d962ae683..b5981b1c16fd7f5928706370516c7a5701dab844 100644 (file)
--- 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
 **
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **

-**  $Id: syserror.cpp,v 1.1 2000/06/19 02:58:08 kevin Exp $
+**  $Id: syserror.cpp,v 1.2 2000/06/19 17:58:20 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
 **
 **  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


@@ -19,6 +19,8 @@
 ******************************************************************************/
 
 #include <iostream>
 ******************************************************************************/
 
 #include <iostream>

+#include <exception>
+#include <stdexcept>

 #include <stdarg.h>
 #include <ctype.h>
 #include "kstddef.h"
 #include <stdarg.h>
 #include <ctype.h>
 #include "kstddef.h"


@@ -87,12 +89,12 @@ void sys_verror (int severity, const char *msg, va_list arg)
     sys_error (ERR_FATAL, "illegal error code #%d  [sys_error]", severity);
   }
   
     sys_error (ERR_FATAL, "illegal error code #%d  [sys_error]", severity);
   }
   

-  vfprintf (stdout, msg, arg);
-
-  cout << "\n";
+  char errStr[512];
+  vsnprintf (errStr, sizeof(errStr), msg, arg);
+  cout << errStr << endl;

   
   if (severity == ERR_FATAL)
   
   if (severity == ERR_FATAL)

-    exit(1);
+    throw runtime_error (errStr);

   
 #if INTERACTIVE_ERROR_DISPLAY
   cout << "A - Abort  C - Continue  W - Turn off warnings? ";
   
 #if INTERACTIVE_ERROR_DISPLAY
   cout << "A - Abort  C - Continue  W - Turn off warnings? ";