Merge YaTL tree.

[m6w6/libmemcached] / libtest / fatal.cc

diff --git a/libtest/fatal.cc b/libtest/fatal.cc
index c61b5cfb8fe0ea842b5f99e0f7f5781c20dfcc50..3327e3819a1bfda7901e406b16055377c166a9f8 100644 (file)
--- a/libtest/fatal.cc
+++ b/libtest/fatal.cc
@@ -34,12 +34,13 @@
  *
  */
 
-#include <config.h>
+#include "libtest/yatlcon.h"
 #include <libtest/common.h>
 #include <cstdarg>
 
 namespace libtest {
 
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 fatal::fatal(const char *file_arg, int line_arg, const char *func_arg, const char *format, ...) :
   std::runtime_error(func_arg),
   _line(line_arg),
@@ -67,11 +68,13 @@ bool fatal::is_disabled()
 
 void fatal::disable()
 {
+  _counter= 0;
   _disabled= true;
 }
 
 void fatal::enable()
 {
+  _counter= 0;
   _disabled= false;
 }
 
@@ -85,8 +88,9 @@ void fatal::increment_disabled_counter()
   _counter++;
 }
 
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 disconnected::disconnected(const char *file_arg, int line_arg, const char *func_arg,
-                           const char *instance, const in_port_t port,
+                           const std::string& instance, const in_port_t port,
                            const char *format, ...) :
   std::runtime_error(func_arg),
   _port(port),
@@ -94,14 +98,13 @@ disconnected::disconnected(const char *file_arg, int line_arg, const char *func_
   _file(file_arg),
   _func(func_arg)
 {
-  strncpy(_instance, instance, sizeof(_instance));
   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", last_error);
+  snprintf(_error_message, sizeof(_error_message), "%s:%u %s", instance.c_str(), uint32_t(port), last_error);
 }
 
 } // namespace libtest