X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ffatal.cc;h=c61b5cfb8fe0ea842b5f99e0f7f5781c20dfcc50;hb=1a09bec1c62a5068126735cc0915020bf487f4b1;hp=75e276d549aca4ff1bf139a7f6214a3ca9b10f61;hpb=a833bac7bfb7b59bb95e84cc8989d0edae6a6136;p=m6w6%2Flibmemcached

diff --git a/libtest/fatal.cc b/libtest/fatal.cc
index 75e276d5..c61b5cfb 100644
--- a/libtest/fatal.cc
+++ b/libtest/fatal.cc
@@ -40,16 +40,21 @@
 
 namespace libtest {
 
-fatal::fatal(const char *file, int line, const char *func, const char *format, ...) :
-  std::runtime_error(func)
+fatal::fatal(const char *file_arg, int line_arg, const char *func_arg, const char *format, ...) :
+  std::runtime_error(func_arg),
+  _line(line_arg),
+  _file(file_arg),
+  _func(func_arg)
   {
     va_list args;
     va_start(args, format);
     char last_error[BUFSIZ];
-    (void)vsnprintf(last_error, sizeof(last_error), format, args);
+    int last_error_length= vsnprintf(last_error, sizeof(last_error), format, args);
     va_end(args);
 
-    snprintf(_error_message, sizeof(_error_message), "%s:%d FATAL:%s (%s)", file, int(line), last_error, func);
+    strncpy(_mesg, last_error, sizeof(_mesg));
+
+    snprintf(_error_message, sizeof(_error_message), "%.*s", last_error_length, last_error);
   }
 
 static bool _disabled= false;
@@ -80,9 +85,14 @@ void fatal::increment_disabled_counter()
   _counter++;
 }
 
-disconnected::disconnected(const char *file, int line, const char *func, const char *instance, const in_port_t port, const char *format, ...) :
+disconnected::disconnected(const char *file_arg, int line_arg, const char *func_arg,
+                           const char *instance, const in_port_t port,
+                           const char *format, ...) :
+  std::runtime_error(func_arg),
   _port(port),
-  std::runtime_error(func)
+  _line(line_arg),
+  _file(file_arg),
+  _func(func_arg)
 {
   strncpy(_instance, instance, sizeof(_instance));
   va_list args;
@@ -91,7 +101,7 @@ disconnected::disconnected(const char *file, int line, const char *func, const c
   (void)vsnprintf(last_error, sizeof(last_error), format, args);
   va_end(args);
 
-  snprintf(_error_message, sizeof(_error_message), "%s:%d FATAL:%s (%s)", file, int(line), last_error, func);
+  snprintf(_error_message, sizeof(_error_message), "%s", last_error);
 }
 
 } // namespace libtest