X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ffatal.cc;h=3327e3819a1bfda7901e406b16055377c166a9f8;hb=1ed39cb2d0601d753ef54be65f24334097f48805;hp=cdccff82aec67818d1c51e0389c751abc1cbbf19;hpb=3db2fad1ae84c7235507bf1adf471461856ddee4;p=awesomized%2Flibmemcached

diff --git a/libtest/fatal.cc b/libtest/fatal.cc
index cdccff82..3327e381 100644
--- a/libtest/fatal.cc
+++ b/libtest/fatal.cc
@@ -34,26 +34,18 @@
  *
  */
 
-#include <config.h>
+#include "libtest/yatlcon.h"
 #include <libtest/common.h>
 #include <cstdarg>
 
 namespace libtest {
 
-exception::exception(const char *file_, int line_, const char *func_) :
-  std::runtime_error(func_),
-  _file(file_),
-  _line(line_),
-  _func(func_)
-  {
-  }
-
-#ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
-#endif
-
-fatal::fatal(const char *file_, int line_, const char *func_, const char *format, ...) :
-  exception(file_, line_, 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);
@@ -61,6 +53,8 @@ fatal::fatal(const char *file_, int line_, const char *func_, const char *format
     int last_error_length= vsnprintf(last_error, sizeof(last_error), format, args);
     va_end(args);
 
+    strncpy(_mesg, last_error, sizeof(_mesg));
+
     snprintf(_error_message, sizeof(_error_message), "%.*s", last_error_length, last_error);
   }
 
@@ -74,11 +68,13 @@ bool fatal::is_disabled()
 
 void fatal::disable()
 {
+  _counter= 0;
   _disabled= true;
 }
 
 void fatal::enable()
 {
+  _counter= 0;
   _disabled= false;
 }
 
@@ -92,26 +88,15 @@ void fatal::increment_disabled_counter()
   _counter++;
 }
 
-disconnected::disconnected(const char *file_, int line_, const char *func_,
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+disconnected::disconnected(const char *file_arg, int line_arg, const char *func_arg,
                            const std::string& instance, const in_port_t port,
                            const char *format, ...) :
-  exception(file_, line_, func_),
-  _port(port)
-{
-  va_list args;
-  va_start(args, format);
-  char last_error[BUFSIZ];
-  (void)vsnprintf(last_error, sizeof(last_error), format, args);
-  va_end(args);
-
-  snprintf(_error_message, sizeof(_error_message), "%s:%u %s", instance.c_str(), uint32_t(port), last_error);
-}
-
-start::start(const char *file_, int line_, const char *func_,
-             const std::string& instance, const in_port_t port,
-             const char *format, ...) :
-  exception(file_, line_, func_),
-  _port(port)
+  std::runtime_error(func_arg),
+  _port(port),
+  _line(line_arg),
+  _file(file_arg),
+  _func(func_arg)
 {
   va_list args;
   va_start(args, format);