diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-07-31 20:53:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-31 22:53:13 +0200 |
| commit | 7cf122fc2a604bae77d0b935536c41ec9203e62d (patch) | |
| tree | 029e18afdceae5ebab686103ee9050a6c6727688 /src/common | |
| parent | 5b863acf9285d675a61819d939f38297f49d5c92 (diff) | |
Core/Misc: Fix static analysis issues (#25178)
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/Logging/Log.cpp | 7 | ||||
| -rw-r--r-- | src/common/Logging/Log.h | 2 | ||||
| -rw-r--r-- | src/common/Utilities/StartProcess.cpp | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp index 13720c4ba41..436f0366064 100644 --- a/src/common/Logging/Log.cpp +++ b/src/common/Logging/Log.cpp @@ -270,12 +270,13 @@ std::string Log::GetTimestampStr() aTm.tm_year + 1900, aTm.tm_mon + 1, aTm.tm_mday, aTm.tm_hour, aTm.tm_min, aTm.tm_sec); } -bool Log::SetLogLevel(std::string const& name, char const* newLevelc, bool isLogger /* = true */) +bool Log::SetLogLevel(std::string const& name, int32 newLeveli, bool isLogger /* = true */) { - LogLevel newLevel = LogLevel(atoi(newLevelc)); - if (newLevel < 0) + if (newLeveli < 0) return false; + LogLevel newLevel = LogLevel(newLeveli); + if (isLogger) { auto it = loggers.begin(); diff --git a/src/common/Logging/Log.h b/src/common/Logging/Log.h index 86ef98cb569..44d0db4f607 100644 --- a/src/common/Logging/Log.h +++ b/src/common/Logging/Log.h @@ -69,7 +69,7 @@ class TC_COMMON_API Log void LoadFromConfig(); void Close(); bool ShouldLog(std::string const& type, LogLevel level) const; - bool SetLogLevel(std::string const& name, char const* level, bool isLogger = true); + bool SetLogLevel(std::string const& name, int32 level, bool isLogger = true); template<typename Format, typename... Args> inline void outMessage(std::string const& filter, LogLevel const level, Format&& fmt, Args&&... args) diff --git a/src/common/Utilities/StartProcess.cpp b/src/common/Utilities/StartProcess.cpp index 66cab86e373..ab81f4db5df 100644 --- a/src/common/Utilities/StartProcess.cpp +++ b/src/common/Utilities/StartProcess.cpp @@ -222,7 +222,7 @@ public: /// Tries to terminate the process void Terminate() override { - if (!my_child) + if (my_child) { was_terminated = true; try |