[#2618] fixed another Wshadow and a Wpedantic

iface_mgr_unittest.cc:2853:25: warning: declaration shadows a local variable [-Wshadow]
shared_network_unittest.cc:430:14: warning: use of non-standard escape character '\{' [-Wpedantic]

diff --git a/src/bin/dhcp6/tests/shared_network_unittest.cc b/src/bin/dhcp6/tests/shared_network_unittest.cc
index 1e07960c344d3fd2bfa1227bd365601fc59c63ec..4571c7500619b2afd8774cad88bba9f6933abde6 100644 (file)
--- a/src/bin/dhcp6/tests/shared_network_unittest.cc
+++ b/src/bin/dhcp6/tests/shared_network_unittest.cc
@@ -427,7 +427,7 @@ const char* NETWORKS_CONFIG[] = {
     "        }"
     "    ],"
     "    \"subnet6\": ["
-    "        \{"
+    "        {"
     "            \"subnet\": \"3000::/96\","
     "            \"id\": 1000,"
     "            \"interface\": \"eth0\","

diff --git a/src/lib/dhcp/tests/iface_mgr_unittest.cc b/src/lib/dhcp/tests/iface_mgr_unittest.cc
index 0ec0c47f8a1d914bbad8c3992c13d6d59c0ea161..b540b502dcda15c59e6b8ec95f22eb6d3a03b80d 100644 (file)
--- a/src/lib/dhcp/tests/iface_mgr_unittest.cc
+++ b/src/lib/dhcp/tests/iface_mgr_unittest.cc
@@ -2850,8 +2850,7 @@ checkIfAddrs(const Iface & iface, struct ifaddrs *& ifptr) {
             isc_throw(Unexpected, "Cannot set SIOCGIFHWADDR flag");
         }
 
-        const uint8_t * p =
-            reinterpret_cast<uint8_t *>(ifr.ifr_ifru.ifru_hwaddr.sa_data);
+        p = reinterpret_cast<uint8_t *>(ifr.ifr_ifru.ifru_hwaddr.sa_data);
 
         close(s);