commit 48002498740996ce57bce399960b0f6f2ff6d1df
author Patrick Williams <patrick@stwcx.xyz> Tue Feb 13 21:43:32 2024 -0600
committer Chris Cain <cjcain@us.ibm.com> Wed Feb 14 16:32:07 2024 +0000
tree b2d4e335747dc8a7033c8b6f2b6f76858452b459
parent 2ff2886b4ce6ab8afca35b8dca392bb42fa6e975

prefer std::format over fmt

Switch to std::format to remove the dependency on fmt.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Id3a1295ba8a90fb756cfc500892dcc5b3235e27b

occ_command.cpp

diff --git a/occ_command.cpp b/occ_command.cpp
index 2ebacb0..e2ec8a7 100644
--- a/occ_command.cpp
+++ b/occ_command.cpp
@@ -4,7 +4,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <fmt/core.h>
 #include <unistd.h>
 
 #include <org/open_power/OCC/Device/error.hpp>
@@ -13,6 +12,7 @@
 #include <phosphor-logging/log.hpp>
 
 #include <algorithm>
+#include <format>
 #include <memory>
 #include <string>
 
@@ -39,14 +39,14 @@
     {
         if (i % 16 == 0)
         {
-            s += fmt::format("{:04X}: ", i);
+            s += std::format("{:04X}: ", i);
         }
         else if (i % 4 == 0)
         {
             s += " ";
         }
 
-        s += fmt::format("{:02X}", data.at(i));
+        s += std::format("{:02X}", data.at(i));
 
         if ((i % 16 == 15) || (i == (dump_length - 1)))
         {
@@ -66,7 +66,7 @@
                   std::placeholders::_1))
 {
     log<level::DEBUG>(
-        fmt::format("OccCommand::OccCommand(path={}, devicePath={}", this->path,
+        std::format("OccCommand::OccCommand(path={}, devicePath={}", this->path,
                     devicePath)
             .c_str());
 }
@@ -76,14 +76,14 @@
     using namespace sdbusplus::org::open_power::OCC::Device::Error;
 
     log<level::DEBUG>(
-        fmt::format("OccCommand::openDevice: calling open {}", devicePath)
+        std::format("OccCommand::openDevice: calling open {}", devicePath)
             .c_str());
     fd = open(devicePath.c_str(), O_RDWR | O_NONBLOCK);
     if (fd < 0)
     {
         const int openErrno = errno;
         log<level::ERR>(
-            fmt::format(
+            std::format(
                 "OccCommand::openDevice: open failed (errno={}, path={})",
                 openErrno, devicePath)
                 .c_str());
@@ -126,7 +126,7 @@
     const uint8_t cmd_type = command[0];
 #ifdef TRACE_PACKETS
     log<level::INFO>(
-        fmt::format("OCC{}: Sending 0x{:02X} command (length={}, {})",
+        std::format("OCC{}: Sending 0x{:02X} command (length={}, {})",
                     occInstance, cmd_type, command.size(), devicePath)
             .c_str());
     dump_hex(command);
@@ -142,7 +142,7 @@
         if ((rc < 0) || (rc != (int)command.size()))
         {
             log<level::ERR>(
-                fmt::format(
+                std::format(
                     "OccCommand::send: write(OCC{}, command:0x{:02X}) failed with errno={} (retries={})",
                     occInstance, cmd_type, writeErrno, retries)
                     .c_str());
@@ -181,7 +181,7 @@
             else
             {
                 log<level::ERR>(
-                    fmt::format(
+                    std::format(
                         "OccCommand::send: read(OCC{}, command:0x{:02X}) failed with errno={} (rspSize={}, retries={})",
                         occInstance, cmd_type, readErrno, response.size(),
                         retries)
@@ -200,7 +200,7 @@
         {
 #ifdef TRACE_PACKETS
             log<level::INFO>(
-                fmt::format(
+                std::format(
                     "OCC{}: Received 0x{:02X} response (length={} w/checksum)",
                     occInstance, cmd_type, response.size())
                     .c_str());
@@ -223,7 +223,7 @@
             if (calcChecksum != rspChecksum)
             {
                 log<level::ERR>(
-                    fmt::format("OCC{}: Checksum Mismatch: response "
+                    std::format("OCC{}: Checksum Mismatch: response "
                                 "0x{:04X}, calculated 0x{:04X}",
                                 occInstance, rspChecksum, calcChecksum)
                         .c_str());
@@ -245,7 +245,7 @@
                 else
                 {
                     log<level::ERR>(
-                        fmt::format(
+                        std::format(
                             "OccCommand::send: Response command mismatch "
                             "(sent: "
                             "0x{:02X}, rsp: 0x{:02X}, rsp seq#: 0x{:02X}",
@@ -258,7 +258,7 @@
         else
         {
             log<level::ERR>(
-                fmt::format(
+                std::format(
                     "OccCommand::send: Invalid OCC{} response length: {}",
                     occInstance, response.size())
                     .c_str());