From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Fri, 7 Dec 2012 18:12:28 +0000 (+0100)
Subject: [2377] cleanup: Simplify the test callback
X-Git-Tag: bind10-1.0.0-beta-release~24^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5137a32591ee4e832354607dea8627ebe1e089c;p=thirdparty%2Fkea.git

[2377] cleanup: Simplify the test callback
---

diff --git a/src/lib/dns/tests/master_loader_unittest.cc b/src/lib/dns/tests/master_loader_unittest.cc
index 1fe9a02e58..a779f9a39f 100644
--- a/src/lib/dns/tests/master_loader_unittest.cc
+++ b/src/lib/dns/tests/master_loader_unittest.cc
@@ -40,23 +40,19 @@ class MasterLoaderTest : public ::testing::Test {
 public:
     MasterLoaderTest() :
         callbacks_(boost::bind(&MasterLoaderTest::callback, this,
-                               true, _1, _2, _3),
+                               &errors_, _1, _2, _3),
                    boost::bind(&MasterLoaderTest::callback, this,
-                               false, _1, _2, _3))
+                               &warnings_, _1, _2, _3))
     {}
 
     /// Concatenate file, line, and reason, and add it to either errors
     /// or warnings
-    void callback(bool error, const std::string& file, size_t line,
+    void callback(vector<string>* target, const std::string& file, size_t line,
                   const std::string reason)
     {
         std::stringstream ss;
         ss << reason << " [" << file << ":" << line << "]";
-        if (error) {
-            errors_.push_back(ss.str());
-        } else {
-            warnings_.push_back(ss.str());
-        }
+        target->push_back(ss.str());
     }
 
     void addRRset(const Name& name, const RRClass& rrclass,