From 7050864750d499ff19424565718436f63f3736d5 Mon Sep 17 00:00:00 2001 From: chuggafan Date: Sun, 25 Jan 2026 20:37:19 -0500 Subject: [PATCH] Minor removal of evaluating + on strings in logging functions. --- src/omake/Depends.cpp | 2 +- src/omake/Depends.h | 2 +- src/omake/Eval.cpp | 16 ++++++++-------- src/omake/JobServer.cpp | 10 ++++------ src/omake/Runner.cpp | 4 ++-- src/omake/Spawner.cpp | 21 ++++++++++++--------- src/omake/os.cpp | 14 ++++++++------ 7 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/omake/Depends.cpp b/src/omake/Depends.cpp index bc4c32597..f95f8b4ce 100644 --- a/src/omake/Depends.cpp +++ b/src/omake/Depends.cpp @@ -25,4 +25,4 @@ #include "Depends.h" #include "BasicLogging.h" -Depends::~Depends() { OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Depends with goal: " + this->GetGoal() + " is being destructed"); } +Depends::~Depends() { OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Depends with goal: ", this->GetGoal(), " is being destructed"); } diff --git a/src/omake/Depends.h b/src/omake/Depends.h index e2243d698..6aea27f14 100644 --- a/src/omake/Depends.h +++ b/src/omake/Depends.h @@ -51,7 +51,7 @@ class Depends ignoreResults(false) { OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, - "Depends with goal: " + this->GetGoal() + " is being destructed"); + "Depends with goal: ", this->GetGoal(), " is being destructed"); } ~Depends(); diff --git a/src/omake/Eval.cpp b/src/omake/Eval.cpp index ec26ef845..43e33bd76 100644 --- a/src/omake/Eval.cpp +++ b/src/omake/Eval.cpp @@ -113,11 +113,11 @@ void Eval::Clear() std::string Eval::Evaluate() { - OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Eval::Evaluate called with str: " + str); + OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Eval::Evaluate called with str: ", str); std::string rv = ParseMacroLine(str); if (expandWildcards) rv = wildcardinternal(rv); - OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Eval::Evaluate called with str: " + str); + OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Eval::Evaluate called with str: ", str); return rv; } @@ -1190,7 +1190,7 @@ std::string Eval::notdir(const std::string& names) rv += " "; rv += intermed; } - OrangeC::Utils::BasicLogger::debug("Eval::notdir with Original name: " + names + " evaluated names " + working + " returns: " + rv); + OrangeC::Utils::BasicLogger::debug("Eval::notdir with Original name: ", names, " evaluated names ", working, " returns: ", rv); return rv; } @@ -1290,7 +1290,7 @@ std::string Eval::addprefix(const std::string& arglist) std::string Eval::wildcard(const std::string& arglist) { - OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Called Eval::wildcard with argslist: " + arglist); + OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Called Eval::wildcard with argslist: ", arglist); std::string names = strip(arglist); std::string rv; @@ -1305,13 +1305,13 @@ std::string Eval::wildcard(const std::string& arglist) rv += current; } } - OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,"Returning from Eval::wildcard: " + rv); + OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,"Returning from Eval::wildcard: ", rv); return rv; } std::string Eval::wildcardinternal(std::string& names) { - OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,"Called Eval::wildcardinternal with argslist: " + names); + OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,"Called Eval::wildcardinternal with argslist: ", names); CmdFiles files; while (!names.empty()) { @@ -1325,7 +1325,7 @@ std::string Eval::wildcardinternal(std::string& names) rv += " "; rv += name; } - OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,"Returning from Eval::wildcardinternal: " + rv); + OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3,"Returning from Eval::wildcardinternal: ", rv); return rv; } @@ -1492,7 +1492,7 @@ std::string Eval::foreach (const std::string& arglist) std::string Eval::call(const std::string& arglist) { - OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Called Eval::call with argslist: " + arglist); + OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Called Eval::call with argslist: ", arglist); std::string sub = arglist; std::string args; std::string rv; diff --git a/src/omake/JobServer.cpp b/src/omake/JobServer.cpp index 745ece831..edc546e16 100644 --- a/src/omake/JobServer.cpp +++ b/src/omake/JobServer.cpp @@ -21,15 +21,13 @@ std::shared_ptr JobServer::GetJobServer(int max_jobs) int pid = getpid(); std::string omake_string = "OMAKE"; std::string combined = omake_string + std::to_string(pid); - OrangeC::Utils::BasicLogger::log(5, - "GetJobServer making new job server: " + combined + " job count: " + std::to_string(max_jobs)); + OrangeC::Utils::BasicLogger::log(5, "GetJobServer making new job server: ", combined, " job count: ", std::to_string(max_jobs)); return std::make_shared(combined, max_jobs); #else int pid = getpid(); std::string omake_string = "OMAKE"; std::string combined = omake_string + std::to_string(pid); - OrangeC::Utils::BasicLogger::log(5, - "GetJobServer making new job server: " + combined + " job count: " + std::to_string(max_jobs)); + OrangeC::Utils::BasicLogger::log(5, "GetJobServer making new job server: ", combined, " job count: ", std::to_string(max_jobs)); return std::make_shared(combined, max_jobs); #endif @@ -45,8 +43,8 @@ std::shared_ptr JobServer::GetJobServer(const std::string& auth_strin { std::string new_string = std::string(auth_string.begin() + found + strlen("auth:"), auth_string.end()); OrangeC::Utils::BasicLogger::log(OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG, - "GetJobServer(std::string) auth based, string: " + auth_string + - " new string: " + new_string); + "GetJobServer(std::string) auth based, string: ", auth_string, + " new string: ", new_string); return std::make_shared(new_string); } else diff --git a/src/omake/Runner.cpp b/src/omake/Runner.cpp index 37a17ac3a..6cceb0c0e 100644 --- a/src/omake/Runner.cpp +++ b/src/omake/Runner.cpp @@ -48,7 +48,7 @@ void Runner::CallRunner(Runner* runner, std::list>* li { auto retval = runner->RunOne(list, depend, env, keepGoing); promise.set_value(retval); - OrangeC::Utils::BasicLogger::debug("CallRunner returning from a runner: " + depend->GetGoal()); + OrangeC::Utils::BasicLogger::debug("CallRunner returning from a runner: ", depend->GetGoal()); } struct future_holding_struct { @@ -124,7 +124,7 @@ int Runner::RunOne(std::list>* ruleStack_in, Depends* { std::promise promise; workingList.push_back(future_holding_struct(depend->GetGoal(), promise.get_future())); - OrangeC::Utils::BasicLogger::debug("RunOne CallRunner Creating a runner: " + i->GetGoal()); + OrangeC::Utils::BasicLogger::debug("RunOne CallRunner Creating a runner: ", i->GetGoal()); auto thrd = std::thread(CallRunner, this, &ruleStack, i.get(), env, keepGoing, std::move(promise)); workingThreads.emplace_back(i->GetGoal(), std::move(thrd)); diff --git a/src/omake/Spawner.cpp b/src/omake/Spawner.cpp index 3e53d9075..ee316a9b4 100644 --- a/src/omake/Spawner.cpp +++ b/src/omake/Spawner.cpp @@ -80,13 +80,15 @@ static bool HasMake(const std::string& cmd, const std::string& make) { m = cmd.find_first_of(" \n\t\r\v", m + 1); } - if ( m != std::string::npos && m > n) + if (m != std::string::npos && m > n) return true; // hack for autoconfig texts which use '&& $(MAKE) ...' // a more complete solution would look for any bash operator I guess... - while (n > 0 && !isspace(cmd[n]) && cmd[n] != '&') n--; - while (n > 0 && isspace(cmd[n])) n--; - if (n > 1 && cmd[n] == '&' && cmd[n-1] == '&') + while (n > 0 && !isspace(cmd[n]) && cmd[n] != '&') + n--; + while (n > 0 && isspace(cmd[n])) + n--; + if (n > 1 && cmd[n] == '&' && cmd[n - 1] == '&') return true; } } @@ -236,11 +238,12 @@ int Spawner::Run(const std::string& cmdin, bool ignoreErrors, bool silent, bool std::string varname = OS::LookupShellNames(); if (!OS::IsUnixLikeShell(varname)) { - OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Command before NormalizeFileName: ", cmdin); + OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, + "Command before NormalizeFileName: ", cmdin); cmd = OS::NormalizeFileName(cmdin); - OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, "Command after NormalizeFileName: ", cmd); - + OrangeC::Utils::BasicLogger::log((int)OrangeC::Utils::VerbosityLevels::VERB_EXTREMEDEBUG + 3, + "Command after NormalizeFileName: ", cmd); } std::string make; Variable* v1 = VariableContainer::Instance()->Lookup("MAKE"); @@ -354,8 +357,8 @@ bool Spawner::split(const std::string& cmd) } std::string Spawner::shell(const std::string& cmd) { - OrangeC::Utils::BasicLogger::log(OrangeC::Utils::VerbosityLevels::VERB_WARNING, - OS::JobName() + " is running $(shell " + cmd + " )"); + OrangeC::Utils::BasicLogger::log(OrangeC::Utils::VerbosityLevels::VERB_WARNING, OS::JobName(), " is running $(shell ", cmd, + " )"); std::string rv = OS::SpawnWithRedirect(cmd); int n = rv.size(); while (n && (rv[n - 1] == '\r' || rv[n - 1] == '\n')) diff --git a/src/omake/os.cpp b/src/omake/os.cpp index cd34405a8..30eae0bd4 100644 --- a/src/omake/os.cpp +++ b/src/omake/os.cpp @@ -933,13 +933,15 @@ std::string OS::SpawnWithRedirect(const std::string command) exit_condition = (WIFEXITED(status) || WIFSTOPPED(status)); if (WIFEXITED(status)) { - OrangeC::Utils::BasicLogger::debug("Process with command: " + command + " exited. ret_wait: " + - std::to_string(ret_wait) + " status: " + std::to_string(status)); + OrangeC::Utils::BasicLogger::debug("Process with command: ", command, + " exited. ret_wait: ", std::to_string(ret_wait), + " status: ", std::to_string(status)); } if (WIFSTOPPED(status)) { - OrangeC::Utils::BasicLogger::debug("Process with command: " + command + " stopped. ret_wait: " + - std::to_string(ret_wait) + " status: " + std::to_string(status)); + OrangeC::Utils::BasicLogger::debug("Process with command: ", command, + " stopped. ret_wait: ", std::to_string(ret_wait), + " status: ", std::to_string(status)); } status = WEXITSTATUS(status); } @@ -947,8 +949,8 @@ std::string OS::SpawnWithRedirect(const std::string command) } while (!exit_condition); close(pipe_cout[0]); close(pipe_cout[1]); - OrangeC::Utils::BasicLogger::debug("OS::SpawnWithRedirect returning from command: " + command + - " with status: " + std::to_string(status)); + OrangeC::Utils::BasicLogger::debug("OS::SpawnWithRedirect returning from command: ", command, + " with status: ", std::to_string(status)); return output_str; #endif }