Merge of cppccheck fixes.

[m6w6/libmemcached] / libtest / failed.cc

diff --git a/libtest/failed.cc b/libtest/failed.cc
index 5ed8020a221066c4c6672730e3d464d89367ba09..ae79e3073f7d5498b9f23b291ca542aefc955d41 100644 (file)
--- a/libtest/failed.cc
+++ b/libtest/failed.cc
@@ -1,9 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  uTest Framework
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
- *  All rights reserved.
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 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
@@ -35,6 +34,7 @@
  *
  */
 
+#include <config.h>
 #include <libtest/common.h>
 
 #include <libtest/failed.h>
@@ -43,32 +43,38 @@
 #include <string>
 #include <vector>
 
-struct failed_test_names_st
-{
-  failed_test_names_st(const char *collection_arg, const char *test_arg) :
+namespace libtest {
+
+struct failed_st {
+  failed_st(const std::string& collection_arg, const std::string& test_arg) :
     collection(collection_arg),
     test(test_arg)
-  {
-  }
+  { }
 
   std::string collection;
   std::string test;
 };
 
-typedef std::vector<failed_test_names_st> Failures;
-
-static Failures failures;
+typedef std::vector<failed_st> Failures;
 
-void push_failed_test(const char *collection, const char *test)
+class Failed
 {
-  failures.push_back(failed_test_names_st(collection, test));
-}
+private:
+  Failures failures;
 
-void print_failed_test(void)
-{
-  for (Failures::iterator iter= failures.begin(); iter != failures.end(); iter++)
+public:
+  void push(const char *collection, const char *test)
   {
-    Error << "\t" << (*iter).collection << " " << (*iter).test;
+    failures.push_back(failed_st(collection, test));
   }
-}
 
+  void print_failed_test(void)
+  {
+    for (Failures::iterator iter= failures.begin(); iter != failures.end(); ++iter)
+    {
+      Error << "\t" << (*iter).collection << " " << (*iter).test;
+    }
+  }
+};
+
+} // namespace libtest