From ef32565d668d795fd0fc055d2ede6a639dbc27b0 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 19 May 2022 15:25:21 -0700
Subject: [PATCH] ircd: Simplify w/ ::snprintf for mostly static init
 callpaths.

---
 ircd/conf.cc | 13 ++++++++-----
 ircd/ios.cc  | 12 ++++++++----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ircd/conf.cc b/ircd/conf.cc
index c6c59861b..4f7a3bd28 100644
--- a/ircd/conf.cc
+++ b/ircd/conf.cc
@@ -496,17 +496,20 @@ ircd::conf::make_env_name(const mutable_buffer &buf,
                           const item<void> &item,
                           const string_view &feature)
 {
-	thread_local char tmp[conf::NAME_MAX_LEN];
+	char tmp[conf::NAME_MAX_LEN] {0};
 	const auto name
 	{
 		make_env_name(tmp, item)
 	};
 
-	return fmt::sprintf
+	return string_view
 	{
-		buf, "%s__%s",
-		name,
-		feature,
+		data(buf), ::snprintf
+		(
+			data(buf), size(buf), "%s__%s",
+			name.c_str(),
+			feature.c_str()
+		)
 	};
 }
 
diff --git a/ircd/ios.cc b/ircd/ios.cc
index 0eab73d1e..8cc327df2 100644
--- a/ircd/ios.cc
+++ b/ircd/ios.cc
@@ -344,11 +344,15 @@ ircd::string_view
 ircd::ios::stats_name(const descriptor &d,
                       const string_view &key)
 {
-	return fmt::sprintf
+	return string_view
 	{
-		stats_name_buf, "ircd.ios.%s.%s",
-		d.name,
-		key,
+		stats_name_buf, ::snprintf
+		(
+			stats_name_buf, sizeof(stats_name_buf),
+			"ircd.ios.%s.%s",
+			d.name.c_str(),
+			key.c_str()
+		)
 	};
 }