X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fresult.cc;h=3e4523d3b42b2dc36cc766e9929a02ee2d826643;hb=538ce08e1871cfa9e409455fd82f9f948635c135;hp=ae37e8d24fd5ae7920db90acb9f1084bb9a95f59;hpb=48e6e1b70b3b79f79334bdea8bfbbb76d377be07;p=awesomized%2Flibmemcached

diff --git a/libtest/result.cc b/libtest/result.cc
index ae37e8d2..3e4523d3 100644
--- a/libtest/result.cc
+++ b/libtest/result.cc
@@ -2,7 +2,7 @@
  *
  *  Data Differential YATL (i.e. libtest)  library
  *
- *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2012-2013 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -38,18 +38,12 @@
 #include <libtest/common.h>
 #include <cstdarg>
 
-#ifndef __INTEL_COMPILER
-# pragma GCC diagnostic ignored "-Wformat-nonliteral"
-#endif
-
 namespace libtest {
 
 __test_result::__test_result(const char *file_arg, int line_arg, const char *func_arg):
-  _line(line_arg),
-  _file(file_arg),
-  _func(func_arg)
-{
-}
+  libtest::exception(file_arg, line_arg, func_arg)
+  {
+  }
 
 __success::__success(const char *file_arg, int line_arg, const char *func_arg):
   __test_result(file_arg, line_arg, func_arg)
@@ -57,85 +51,31 @@ __success::__success(const char *file_arg, int line_arg, const char *func_arg):
 }
 
 __skipped::__skipped(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)
+  __test_result(file_arg, line_arg, func_arg)
 {
   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)
-  {
-    _error_message_size++;
-  }
+  init(args);
   va_end(args);
 }
 
-__skipped::__skipped( const __skipped& other ) :
-  __test_result(other),
-  _error_message_size(other._error_message_size)
+__skipped::__skipped(const __skipped& other) :
+  __test_result(other)
 {
-  _error_message= (char*) malloc(_error_message_size);
-  if (_error_message)
-  {
-    memcpy(_error_message, other._error_message, _error_message_size);
-  }
-  else
-  {
-    _error_message_size= -1;
-  }
-}
-
-__skipped::~__skipped() throw()
-{
-  if ((_error_message_size > 0) and _error_message)
-  {
-    free(_error_message);
-    _error_message= NULL;
-  }
 }
 
 __failure::__failure(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)
+  __test_result(file_arg, line_arg, func_arg)
 {
   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)
-  {
-    _error_message_size++;
-  }
+  init(args);
   va_end(args);
 }
 
-__failure::__failure( const __failure& 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;
-  }
-}
-
-__failure::~__failure() throw()
+__failure::__failure(const __failure& other) :
+  __test_result(other)
 {
-  if ((_error_message_size > 0) and _error_message)
-  {
-    free(_error_message);
-    _error_message= NULL;
-  }
 }