From: Francis Dupont <fdupont@isc.org>
Date: Tue, 6 Sep 2016 10:53:45 +0000 (+0200)
Subject: [5004] Addressed comments
X-Git-Tag: trac5006_base~30^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=163aa35564fde6c6eb62ce3c52e900ae324e78d5;p=thirdparty%2Fkea.git

[5004] Addressed comments
---

diff --git a/src/lib/config/command_mgr.cc b/src/lib/config/command_mgr.cc
index 1ae374e49e..ae33188014 100644
--- a/src/lib/config/command_mgr.cc
+++ b/src/lib/config/command_mgr.cc
@@ -151,8 +151,8 @@ CommandMgr::commandReader(int sockfd) {
     try {
 
         // Try to interpret it as JSON.
-	std::string sbuf(buf, static_cast<size_t>(rval));
-	cmd = Element::fromJSON(sbuf, true);
+        std::string sbuf(buf, static_cast<size_t>(rval));
+        cmd = Element::fromJSON(sbuf, true);
 
         // If successful, then process it as a command.
         rsp = CommandMgr::instance().processCommand(cmd);
diff --git a/src/lib/eval/tests/token_unittest.cc b/src/lib/eval/tests/token_unittest.cc
index d5a82ce321..d344a06b3b 100644
--- a/src/lib/eval/tests/token_unittest.cc
+++ b/src/lib/eval/tests/token_unittest.cc
@@ -294,10 +294,10 @@ public:
         OpaqueDataTuple::LengthFieldType len = (u == Option::V4?OpaqueDataTuple::LENGTH_1_BYTE:
                                                 OpaqueDataTuple::LENGTH_2_BYTES);
         const char* content[] = { "alpha", "beta", "delta", "gamma", "epsilon",
-                                 "zeta", "eta", "theta", "iota", "kappa" };
-	size_t nb_content = sizeof(content) / sizeof(char*);
+                                  "zeta", "eta", "theta", "iota", "kappa" };
+        const size_t nb_content = sizeof(content) / sizeof(char*);
         ASSERT_TRUE(tuples_size < nb_content);
-        for (unsigned i = 0; i < tuples_size; ++i) {
+        for (size_t i = 0; i < tuples_size; ++i) {
             OpaqueDataTuple tuple(len);
             tuple.assign(string(content[i]));
             if (u == Option::V4 && i == 0) {
diff --git a/src/lib/util/tests/socketsession_unittest.cc b/src/lib/util/tests/socketsession_unittest.cc
index aa0b7e3e8d..2c81e29de6 100644
--- a/src/lib/util/tests/socketsession_unittest.cc
+++ b/src/lib/util/tests/socketsession_unittest.cc
@@ -532,7 +532,7 @@ ForwardTest::checkPushAndPop(int family, int type, int protocol,
     // reliable.  Instead we impose some reasonably large upper time limit of
     // blocking (normally it shouldn't even block at all; the limit is to
     // force the test to stop even if there's some bug and recv fails).
-    char recvbuf[sizeof(TEST_DATA) + 1];
+    char recvbuf[sizeof(TEST_DATA) + 1] = { };
     sockaddr_storage ss;
     socklen_t sa_len = sizeof(ss);
     if (protocol == IPPROTO_UDP) {