*
*/
-#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),
strncpy(_mesg, last_error, sizeof(_mesg));
- snprintf(_error_message, sizeof(_error_message), "%s", last_error);
+ snprintf(_error_message, sizeof(_error_message), "%.*s", last_error_length, last_error);
}
static bool _disabled= false;
void fatal::disable()
{
+ _counter= 0;
_disabled= true;
}
void fatal::enable()
{
+ _counter= 0;
_disabled= false;
}
_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),
_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
-