commit 0420c6ac6a05a5ac122564709e6ee157d2ec7a81
author William A. Kennington III <wak@google.com> Thu Jun 27 14:38:17 2019 -0700
committer William A. Kennington III <wak@google.com> Thu Jun 27 15:17:19 2019 -0700
tree be9a67c9021eac6b7aaf956896d67570c0d23cb7
parent 946d15940bd90c4045a533310eb9f3fda1834fac

build: Apply fixes to accommodate build system updates

 - Fixes clang-format changes for version 6 -> 8
 - Fixes possible strncpy trunction error
 - Fix for an optional std::variant behavior changed in gcc9

Change-Id: I80fe43b261e9b17ba662f17ea2854bd1fb6f1d61
Signed-off-by: William A. Kennington III <wak@google.com>

ethernet_interface.cpp

diff --git a/ethernet_interface.cpp b/ethernet_interface.cpp
index 92ba2cc..053d82f 100644
--- a/ethernet_interface.cpp
+++ b/ethernet_interface.cpp
@@ -231,7 +231,7 @@
             break;
         }
 
-        strncpy(ifr.ifr_name, interfaceName().c_str(), sizeof(ifr.ifr_name));
+        strcpy(ifr.ifr_name, interfaceName().c_str());
         ifr.ifr_data = reinterpret_cast<char*>(&edata);
 
         edata.cmd = ETHTOOL_GSET;

test/test_util.cpp

diff --git a/test/test_util.cpp b/test/test_util.cpp
index d2be390..4e79394 100644
--- a/test/test_util.cpp
+++ b/test/test_util.cpp
@@ -91,24 +91,6 @@
     struct in6_addr ip2;
     EXPECT_EQ(1, inet_pton(AF_INET6, "fdd8:b5ad:9d93:94ee::2:1", &ip2));
     EXPECT_EQ("fdd8:b5ad:9d93:94ee::2:1", toString(InAddrAny(ip2)));
-
-    InAddrAny ip3;
-    try
-    {
-        struct E
-        {
-            operator struct in6_addr()
-            {
-                throw 1;
-            }
-        };
-        ip3.emplace<struct in6_addr>(E());
-        EXPECT_TRUE(false);
-    }
-    catch (...)
-    {
-    }
-    EXPECT_THROW(toString(ip3), std::runtime_error);
 }
 
 TEST_F(TestUtil, IpValidation)

util.hpp

diff --git a/util.hpp b/util.hpp
index 0f03af3..723c941 100644
--- a/util.hpp
+++ b/util.hpp
@@ -191,7 +191,7 @@
 template <typename... ArgTypes>
 void execute(const char* path, ArgTypes&&... tArgs)
 {
-    using expandType = char* [];
+    using expandType = char*[];
 
     expandType args = {const_cast<char*>(tArgs)..., nullptr};