*
*/
-#include <config.h>
+#include "libtest/yatlcon.h"
#include <libtest/common.h>
#include <cstdarg>
namespace libtest {
-fatal::fatal(const char *file_arg, int line_arg, const char *func_arg, const char *format, ...) :
- std::runtime_error(func_arg),
- _file(file_arg),
- _line(line_arg),
- _func(func_arg)
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+
+fatal::fatal(const char *file_arg, int line_arg, const char *func_arg, ...) :
+ __test_result(file_arg, line_arg, func_arg),
+ _error_message(NULL),
+ _error_message_size(0)
+{
+ va_list args;
+ va_start(args, func_arg);
+ const char *format= va_arg(args, const char *);
+ _error_message_size= vasprintf(&_error_message, format, args);
+ assert(_error_message_size != -1);
+ if (_error_message_size > 0)
{
- va_list args;
- va_start(args, format);
- char last_error[BUFSIZ];
- int last_error_length= vsnprintf(last_error, sizeof(last_error), format, args);
- va_end(args);
+ _error_message_size++;
+ }
+ va_end(args);
+}
- strncpy(_mesg, last_error, sizeof(_mesg));
+fatal::fatal( const fatal& other ) :
+ __test_result(other),
+ _error_message_size(other._error_message_size)
+{
+ _error_message= (char*) malloc(_error_message_size);
+ if (_error_message)
+ {
+ memcpy(_error_message, other._error_message, _error_message_size);
+ }
+ else
+ {
+ _error_message_size= -1;
+ }
+}
- snprintf(_error_message, sizeof(_error_message), "%s:%d FATAL:%s (%s)", _file, int(_line), last_error, _func);
+fatal::~fatal() throw()
+{
+ if ((_error_message_size > 0) and _error_message)
+ {
+ free(_error_message);
+ _error_message= NULL;
}
+}
static bool _disabled= false;
static uint32_t _counter= 0;
void fatal::disable()
{
+ _counter= 0;
_disabled= true;
}
void fatal::enable()
{
+ _counter= 0;
_disabled= false;
}
_counter++;
}
-disconnected::disconnected(const char *file, int line, const char *func, const char *instance, const in_port_t port, const char *format, ...) :
+#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, ...) :
+ 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;
- va_start(args, format);
+ va_start(args, port);
+ const char *format= va_arg(args, const char *);
char last_error[BUFSIZ];
(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:%u %s", instance.c_str(), uint32_t(port), last_error);
}
} // namespace libtest
-