commit 8664252af8cac7f5c3e9ce693e546e0a6d1af39a
author William A. Kennington III <wak@google.com> Mon Jul 24 17:55:55 2023 -0700
committer William A. Kennington III <wak@google.com> Tue Jul 25 02:55:45 2023 -0700
tree 01774de57bda2837e135d7a8d6039f5829113397
parent b740196bd220202cc2dd4f04c4ff409a79338e33

treewide: Remove uses of FMT_COMPILE

We can use stdplus::strCat which takes even less code space.

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

src/util.cpp

diff --git a/src/util.cpp b/src/util.cpp
index b04cfd6..3e1916a 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -5,13 +5,13 @@
 #include "config_parser.hpp"
 #include "types.hpp"
 
-#include <fmt/compile.h>
-#include <fmt/format.h>
 #include <sys/wait.h>
 
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/lg2.hpp>
 #include <stdplus/numeric/str.hpp>
+#include <stdplus/str/buf.hpp>
+#include <stdplus/str/cat.hpp>
 #include <xyz/openbmc_project/Common/error.hpp>
 
 #include <cctype>
@@ -30,7 +30,7 @@
 namespace internal
 {
 
-void executeCommandinChildProcess(stdplus::const_zstring path, char** args)
+void executeCommandinChildProcess(stdplus::zstring_view path, char** args)
 {
     using namespace std::string_literals;
     pid_t pid = fork();
@@ -60,11 +60,11 @@
 
         if (status < 0)
         {
-            fmt::memory_buffer buf;
-            fmt::format_to(fmt::appender(buf), "`{}`", path);
+            stdplus::StrBuf buf;
+            stdplus::strAppend(buf, "`"sv, path, "`"sv);
             for (size_t i = 0; args[i] != nullptr; ++i)
             {
-                fmt::format_to(fmt::appender(buf), " `{}`", args[i]);
+                stdplus::strAppend(buf, " `"sv, args[i], "`"sv);
             }
             buf.push_back('\0');
             lg2::error("Unable to execute the command {CMD}: {STATUS}", "CMD",
@@ -145,7 +145,8 @@
     {
         return "ethaddr";
     }
-    return fmt::format(FMT_COMPILE("eth{}addr"), idx);
+    stdplus::ToStrHandle<stdplus::IntToStr<10, unsigned>> tsh;
+    return stdplus::strCat("eth"sv, tsh(idx), "addr"sv);
 }
 
 static std::optional<DHCPVal> systemdParseDHCP(std::string_view str)