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_ffdc.cpp

diff --git a/occ_ffdc.cpp b/occ_ffdc.cpp
index 973a554..131913b 100644
--- a/occ_ffdc.cpp
+++ b/occ_ffdc.cpp
@@ -4,7 +4,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <fmt/core.h>
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
@@ -17,6 +16,8 @@
 #include <xyz/openbmc_project/Common/error.hpp>
 #include <xyz/openbmc_project/Logging/Create/server.hpp>
 
+#include <format>
+
 namespace open_power
 {
 namespace occ
@@ -43,7 +44,7 @@
         pelFFDCInfo;
 
     log<level::INFO>(
-        fmt::format("Creating PEL for OCC{} with SBE FFDC: {} - SRC6: 0x{:08X}",
+        std::format("Creating PEL for OCC{} with SBE FFDC: {} - SRC6: 0x{:08X}",
                     src6 >> 16, path, src6)
             .c_str());
 
@@ -92,7 +93,7 @@
     catch (const sdbusplus::exception_t& e)
     {
         log<level::ERR>(
-            fmt::format("Failed to create PEL: {}", e.what()).c_str());
+            std::format("Failed to create PEL: {}", e.what()).c_str());
     }
 
     return plid;
@@ -118,7 +119,7 @@
     additionalData.emplace("OCC", std::to_string(instance));
 
     log<level::INFO>(
-        fmt::format("Creating OCC Reset PEL for OCC{}: {}", instance, path)
+        std::format("Creating OCC Reset PEL for OCC{}: {}", instance, path)
             .c_str());
 
     auto& bus = utils::getBus();
@@ -150,7 +151,7 @@
     catch (const sdbusplus::exception_t& e)
     {
         log<level::ERR>(
-            fmt::format("Failed to create OCC Reset PEL: {}", e.what())
+            std::format("Failed to create OCC Reset PEL: {}", e.what())
                 .c_str());
     }
 }
@@ -239,7 +240,7 @@
     if (journalFile && journalFile->fd() != -1)
     {
         log<level::DEBUG>(
-            fmt::format(
+            std::format(
                 "addJournalEntries: Added up to {} journal entries for {}",
                 lines, executable)
                 .c_str());
@@ -248,7 +249,7 @@
     else
     {
         log<level::ERR>(
-            fmt::format(
+            std::format(
                 "addJournalEntries: Failed to add journal entries for {}",
                 executable)
                 .c_str());
@@ -275,7 +276,7 @@
         {
             auto e = errno;
             log<level::ERR>(
-                fmt::format(
+                std::format(
                     "makeJsonFFDCFile: Failed call to write JSON FFDC file, errno={}",
                     e)
                     .c_str());
@@ -285,7 +286,7 @@
     {
         auto e = errno;
         log<level::ERR>(
-            fmt::format("makeJsonFFDCFile: Failed called to mkostemp, errno={}",
+            std::format("makeJsonFFDCFile: Failed called to mkostemp, errno={}",
                         e)
                 .c_str());
     }
@@ -429,7 +430,7 @@
     {
         auto e = errno;
         log<level::ERR>(
-            fmt::format("FFDCFile: Could not open FFDC file {}. errno {}",
+            std::format("FFDCFile: Could not open FFDC file {}. errno {}",
                         _name.string(), e)
                 .c_str());
     }