refactor: optimize string operations and improve code clarity (#451)

WiserTixx · web-flow · commit 6ec4106ec7ec · 2026-01-02T00:42:03.000+01:00
- Avoid redundant substr() calls in packet parsing hot-path
(TServer.cpp)
  The previous code called substr(3) twice per packet, creating
  unnecessary temporary strings. Now stores the result once.

- Replace .size() == 0 with .empty() for idiomatic C++
  (TConsole.cpp, TLuaEngine.cpp)
diff --git a/src/TConsole.cpp b/src/TConsole.cpp
@@ -160,7 +160,7 @@ void TConsole::ChangeToRegularConsole() {
 }
 
 bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t n) {
-    if (n == 0 && args.size() != 0) {
+    if (n == 0 && !args.empty()) {
         Application::Console().WriteRaw("This command expects no arguments.");
         return false;
     } else if (args.size() != n) {
@@ -198,7 +198,7 @@ void TConsole::Command_Lua(const std::string&, const std::vector<std::string>& a
         } else {
             Application::Console().WriteRaw("Lua state '" + NewStateId + "' is not a known state. Didn't switch to Lua.");
         }
-    } else if (args.size() == 0) {
+    } else if (args.empty()) {
         ChangeToLuaConsole(mDefaultStateId);
     }
 }
@@ -423,7 +423,7 @@ void TConsole::Command_Settings(const std::string&, const std::vector<std::strin
         settings set <category> <setting> <value>   sets specified setting to value
         )";
 
-    if (args.size() == 0) {
+    if (args.empty()) {
         beammp_errorf("No arguments specified for command 'settings'!");
         Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));
         return;
@@ -705,7 +705,7 @@ void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {
             }
         }
     }
-    if (NonNilFutures.size() == 0) {
+    if (NonNilFutures.empty()) {
         if (!IgnoreNotACommand) {
             Application::Console().WriteRaw("Error: Unknown command: '" + cmd + "'. Type 'help' to see a list of valid commands.");
         }
diff --git a/src/TLuaEngine.cpp b/src/TLuaEngine.cpp
@@ -131,7 +131,7 @@ void TLuaEngine::operator()() {
                 }
             }
         }
-        if (mLuaStates.size() == 0) {
+        if (mLuaStates.empty()) {
             beammp_trace("No Lua states, event loop running extremely sparsely");
             Application::SleepSafeSeconds(10);
         } else {
diff --git a/src/TServer.cpp b/src/TServer.cpp
@@ -198,7 +198,8 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
         int PID = -1;
         int VID = -1;
 
-        auto MaybePidVid = GetPidVid(StringPacket.substr(3).substr(0, StringPacket.substr(3).find(':', 1)));
+        auto pidVidPart = StringPacket.substr(3);
+        auto MaybePidVid = GetPidVid(pidVidPart.substr(0, pidVidPart.find(':')));
         if (MaybePidVid) {
             std::tie(PID, VID) = MaybePidVid.value();
         }
@@ -293,7 +294,8 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
         int PID = -1;
         int VID = -1;
 
-        auto MaybePidVid = GetPidVid(StringPacket.substr(3).substr(0, StringPacket.substr(3).find(':', 1)));
+        auto pidVidPart = StringPacket.substr(3);
+        auto MaybePidVid = GetPidVid(pidVidPart.substr(0, pidVidPart.find(':')));
         if (MaybePidVid) {
             std::tie(PID, VID) = MaybePidVid.value();
         }

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ void TConsole::ChangeToRegularConsole() {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`bool TConsole::EnsureArgsCount(const std::vector<std::string>& args, size_t n) {`
`163`		`- if (n == 0 && args.size() != 0) {`
	`163`	`+ if (n == 0 && !args.empty()) {`
`164`	`164`	`Application::Console().WriteRaw("This command expects no arguments.");`
`165`	`165`	`return false;`
`166`	`166`	`} else if (args.size() != n) {`
`@@ -198,7 +198,7 @@ void TConsole::Command_Lua(const std::string&, const std::vector<std::string>& a`
`198`	`198`	`} else {`
`199`	`199`	`Application::Console().WriteRaw("Lua state '" + NewStateId + "' is not a known state. Didn't switch to Lua.");`
`200`	`200`	`}`
`201`		`- } else if (args.size() == 0) {`
	`201`	`+ } else if (args.empty()) {`
`202`	`202`	`ChangeToLuaConsole(mDefaultStateId);`
`203`	`203`	`}`
`204`	`204`	`}`
`@@ -423,7 +423,7 @@ void TConsole::Command_Settings(const std::string&, const std::vector<std::strin`
`423`	`423`	`settings set <category> <setting> <value> sets specified setting to value`
`424`	`424`	`)";`
`425`	`425`
`426`		`- if (args.size() == 0) {`
	`426`	`+ if (args.empty()) {`
`427`	`427`	`beammp_errorf("No arguments specified for command 'settings'!");`
`428`	`428`	`Application::Console().WriteRaw("BeamMP-Server Console: " + std::string(sHelpString));`
`429`	`429`	`return;`
`@@ -705,7 +705,7 @@ void TConsole::RunAsCommand(const std::string& cmd, bool IgnoreNotACommand) {`
`705`	`705`	`}`
`706`	`706`	`}`
`707`	`707`	`}`
`708`		`- if (NonNilFutures.size() == 0) {`
	`708`	`+ if (NonNilFutures.empty()) {`
`709`	`709`	`if (!IgnoreNotACommand) {`
`710`	`710`	`Application::Console().WriteRaw("Error: Unknown command: '" + cmd + "'. Type 'help' to see a list of valid commands.");`
`711`	`711`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ void TLuaEngine::operator()() {`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`	`}`
`134`		`- if (mLuaStates.size() == 0) {`
	`134`	`+ if (mLuaStates.empty()) {`
`135`	`135`	`beammp_trace("No Lua states, event loop running extremely sparsely");`
`136`	`136`	`Application::SleepSafeSeconds(10);`
`137`	`137`	`} else {`