commit 12beaada9064359498ec6418f104ab599d54a75a
author William A. Kennington III <wak@google.com> Sat Jun 13 19:30:41 2020 -0700
committer William A. Kennington III <wak@google.com> Sat Jun 13 19:30:48 2020 -0700
tree adcf055fd3543db50e27f8d51f77e8871e288577
parent b6103f2cfc71ec1bb2b80f8239d093ec2f2825a5

util: Replace raw struct functions with stdplus

These functions were recently added to stdplus as they are useful across
projects.

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

netlink.cpp

diff --git a/netlink.cpp b/netlink.cpp
index 947b828..9039575 100644
--- a/netlink.cpp
+++ b/netlink.cpp
@@ -9,6 +9,7 @@
 
 #include <array>
 #include <stdexcept>
+#include <stdplus/raw.hpp>
 #include <system_error>
 
 namespace phosphor
@@ -23,7 +24,7 @@
 void processMsg(std::string_view& msgs, bool& done, const ReceiveCallback& cb)
 {
     // Parse and update the message buffer
-    auto hdr = copyFrom<nlmsghdr>(msgs, "Bad netlink header");
+    auto hdr = stdplus::raw::copyFrom<nlmsghdr>(msgs);
     if (hdr.nlmsg_len < sizeof(hdr))
     {
         throw std::runtime_error("Invalid nlmsg length");
@@ -56,7 +57,7 @@
     }
     else if (hdr.nlmsg_type == NLMSG_ERROR)
     {
-        auto err = copyFrom<nlmsgerr>(msg, "Bad netlink error");
+        auto err = stdplus::raw::copyFrom<nlmsgerr>(msg);
         // This is just an ACK so don't do the callback
         if (err.error <= 0)
         {
@@ -175,7 +176,7 @@
 
 std::tuple<rtattr, std::string_view> extractRtAttr(std::string_view& data)
 {
-    auto hdr = copyFrom<rtattr>(data, "Bad rtattr header");
+    auto hdr = stdplus::raw::copyFrom<rtattr>(data);
     if (hdr.rta_len < RTA_LENGTH(0))
     {
         throw std::runtime_error("Invalid rtattr length");