Avoid the use of ConvToStr in string concatenation.

This function calls INSP_FORMAT in most cases nowadays so we may
as well just call that manually.

4 files changed, 10 insertions, 7 deletions

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 85b41f56c..43aaa5e1a 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -330,7 +330,7 @@ void TreeSocket::SendCapabilities(int phase)
 		return;
 
 	if (capab->capab_phase < 1 && phase >= 1)
-		WriteLine("CAPAB START " + ConvToStr(PROTO_NEWEST));
+		WriteLine(INSP_FORMAT("CAPAB START {}", (uint16_t)PROTO_NEWEST));
 
 	capab->capab_phase = phase;
 	if (phase < 2)
diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index 12dbe931a..1dda7b9f8 100644
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -100,7 +100,10 @@ static std::vector<std::string> GetMap(User* user, TreeServer* current, size_t m
 	if (user->IsOper())
 	{
 		time_t secs_up = ServerInstance->Time() - current->age;
-		buffer += " [Up: " + Duration::ToString(secs_up) + (current->rtt == 0 ? "]" : " Lag: " + ConvToStr(current->rtt) + "ms]");
+		buffer += INSP_FORMAT(" [Up: {}", Duration::ToString(secs_up));
+		if (current->rtt)
+			buffer += INSP_FORMAT(" Lag: {}ms", current->rtt);
+		buffer += "]";
 	}
 
 	std::vector<std::string> map;
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index eae8cbe21..3d454eef9 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -161,11 +161,11 @@ void TreeSocket::ProcessLine(std::string& line)
 				if (!params.empty())
 				{
 					time_t them = ServerCommand::ExtractTS(params[0]);
-					time_t delta = them - ServerInstance->Time();
-					if ((delta < -15) || (delta > 15))
+					time_t delta = std::abs(them - ServerInstance->Time());
+					if (delta > 15)
 					{
-						ServerInstance->SNO.WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by {} seconds (this is more than fifteen seconds). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", labs((long)delta));
-						SendError("Your clocks are out by "+ConvToStr(labs((long)delta))+" seconds (this is more than fifteen seconds). Link aborted, PLEASE SYNC YOUR CLOCKS!");
+						ServerInstance->SNO.WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by {} seconds (this is more than fifteen seconds). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", delta);
+						SendError(INSP_FORMAT("Your clocks are out by {} seconds (this is more than fifteen seconds). Link aborted, PLEASE SYNC YOUR CLOCKS!", delta));
 						return;
 					}
 					else if ((delta < -5) || (delta > 5))
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index e149db881..9a10450f9 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -301,7 +301,7 @@ void SpanningTreeUtilities::ReadConfiguration()
 			throw ModuleException((Module*)Creator, "The link name '"+L->Name+"' is invalid as it must contain at least one '.' character");
 
 		if (L->Name.length() > ServerInstance->Config->Limits.MaxHost)
-			throw ModuleException((Module*)Creator, "The link name '"+L->Name+"' is invalid as it is longer than " + ConvToStr(ServerInstance->Config->Limits.MaxHost) + " characters");
+			throw ModuleException((Module*)Creator, INSP_FORMAT("The link name '{}' is invalid as it is longer than {} characters", L->Name, ServerInstance->Config->Limits.MaxHost));
 
 		if (L->RecvPass.empty())
 			throw ModuleException((Module*)Creator, "Invalid configuration for server '"+L->Name+"', recvpass not defined");