commit cbe5073f6b7cf07e87bb53d3cfa417a0bc6f37d9
author William A. Kennington III <wak@google.com> Tue Jul 25 13:52:18 2023 -0700
committer William A. Kennington III <wak@google.com> Tue Jul 25 14:30:51 2023 -0700
tree 3677cdf65e4056bb72d46e65ca62761e35887f37
parent cafc1512047d4044a0fc04ea24ca123dad522df4

ncsi_util: Cleanup joins over ranges

We can change these to std::format once we have c++23

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

src/ncsi_util.cpp

diff --git a/src/ncsi_util.cpp b/src/ncsi_util.cpp
index 70e934b..c739d6f 100644
--- a/src/ncsi_util.cpp
+++ b/src/ncsi_util.cpp
@@ -1,12 +1,13 @@
 #include "ncsi_util.hpp"
 
-#include <fmt/format.h>
 #include <linux/ncsi.h>
 #include <netlink/genl/ctrl.h>
 #include <netlink/genl/genl.h>
 #include <netlink/netlink.h>
 
 #include <phosphor-logging/lg2.hpp>
+#include <stdplus/numeric/str.hpp>
+#include <stdplus/str/buf.hpp>
 
 #include <iomanip>
 #include <iostream>
@@ -21,6 +22,25 @@
 
 using CallBack = int (*)(struct nl_msg* msg, void* arg);
 
+static stdplus::StrBuf toHexStr(std::span<const uint8_t> c) noexcept
+{
+    stdplus::StrBuf ret;
+    if (c.empty())
+    {
+        return ret;
+    }
+    stdplus::IntToStr<16, uint8_t> its;
+    auto oit = ret.append(c.size() * 3 - 1);
+    auto cit = c.begin();
+    oit = its(oit, *cit++, 2);
+    for (; cit != c.end(); ++cit)
+    {
+        *oit++ = ' ';
+        oit = its(oit, *cit, 2);
+    }
+    return ret;
+}
+
 namespace internal
 {
 
@@ -238,12 +258,11 @@
     auto data_len = nla_len(tb[NCSI_ATTR_DATA]) - sizeof(NCSIPacketHeader);
     unsigned char* data = (unsigned char*)nla_data(tb[NCSI_ATTR_DATA]) +
                           sizeof(NCSIPacketHeader);
-    auto s = std::span<const unsigned char>(data, data_len);
 
     // Dump the response to stdout. Enhancement: option to save response data
-    lg2::debug("Response : {DATA_LEN} bytes, {DATA}", "DATA_LEN", data_len,
-               "DATA",
-               fmt::format("{:02x}", fmt::join(s.begin(), s.end(), " ")));
+    auto str = toHexStr(std::span<const unsigned char>(data, data_len));
+    lg2::debug("Response {DATA_LEN} bytes: {DATA}", "DATA_LEN", data_len,
+               "DATA", str);
 
     return 0;
 };
@@ -390,12 +409,7 @@
                "INTERFACE_INDEX", lg2::hex, ifindex);
     if (!payload.empty())
     {
-        std::string payloadStr;
-        for (auto& i : payload)
-        {
-            payloadStr += fmt::format(" {:02x}", (int)i);
-        }
-        lg2::debug("Payload :{PAYLOAD}", "PAYLOAD", payloadStr);
+        lg2::debug("Payload: {PAYLOAD}", "PAYLOAD", toHexStr(payload));
     }
 
     return internal::applyCmd(