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/config_parser.cpp

diff --git a/src/config_parser.cpp b/src/config_parser.cpp
index afa563a..8c84e95 100644
--- a/src/config_parser.cpp
+++ b/src/config_parser.cpp
@@ -1,6 +1,5 @@
 #include "config_parser.hpp"
 
-#include <fmt/compile.h>
 #include <fmt/format.h>
 
 #include <stdplus/exception.hpp>
@@ -8,6 +7,7 @@
 #include <stdplus/fd/create.hpp>
 #include <stdplus/fd/fmt.hpp>
 #include <stdplus/fd/line.hpp>
+#include <stdplus/str/cat.hpp>
 
 #include <functional>
 #include <iterator>
@@ -47,12 +47,12 @@
 
 fs::path pathForIntfConf(const fs::path& dir, std::string_view intf)
 {
-    return dir / fmt::format(FMT_COMPILE("00-bmc-{}.network"), intf);
+    return dir / stdplus::strCat("00-bmc-"sv, intf, ".network"sv);
 }
 
 fs::path pathForIntfDev(const fs::path& dir, std::string_view intf)
 {
-    return dir / fmt::format(FMT_COMPILE("{}.netdev"), intf);
+    return dir / stdplus::strCat(intf, ".netdev"sv);
 }
 
 const std::string*
@@ -90,7 +90,7 @@
         if (c == '\n' || c == '=')
         {
             throw std::invalid_argument(
-                fmt::format(FMT_COMPILE("Invalid Config Key: {}"), s));
+                stdplus::strCat("Invalid Config Key: "sv, s));
         }
     }
 }
@@ -102,7 +102,7 @@
         if (c == '\n' || c == ']')
         {
             throw std::invalid_argument(
-                fmt::format(FMT_COMPILE("Invalid Config Section: {}"), s));
+                stdplus::strCat("Invalid Config Section: "sv, s));
         }
     }
 }
@@ -114,7 +114,7 @@
         if (c == '\n')
         {
             throw std::invalid_argument(
-                fmt::format(FMT_COMPILE("Invalid Config Value: {}"), s));
+                stdplus::strCat("Invalid Config Value: "sv, s));
         }
     }
 }
@@ -287,12 +287,12 @@
     {
         for (const auto& map : maps)
         {
-            out.append(FMT_COMPILE("[{}]\n"), section.get());
+            out.appends("["sv, section.get(), "]\n"sv);
             for (const auto& [key, vals] : map)
             {
                 for (const auto& val : vals)
                 {
-                    out.append(FMT_COMPILE("{}={}\n"), key.get(), val.get());
+                    out.appends(key.get(), "="sv, val.get(), "\n"sv);
                 }
             }
         }