From 0bd4cd398b19c2ef90e2f39b40a60b9fa915d2b2 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Wed, 2 May 2018 11:25:20 +0200 Subject: [PATCH] logging: remove unused return value from LogPrintStr `LogPrintStr` returns the number of characters printed. This number is doubled if both logging to console and logging to file is enabled. As the return value is never used, I've opted to remove it instead of try to fix it. Credit: @laanwj --- src/logging.cpp | 12 ++++-------- src/logging.h | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/logging.cpp b/src/logging.cpp index 604696937..60d418fdb 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -198,15 +198,13 @@ std::string BCLog::Logger::LogTimestampStr(const std::string &str) return strStamped; } -int BCLog::Logger::LogPrintStr(const std::string &str) +void BCLog::Logger::LogPrintStr(const std::string &str) { - int ret = 0; // Returns total number of characters written - std::string strTimestamped = LogTimestampStr(str); if (m_print_to_console) { // print to console - ret = fwrite(strTimestamped.data(), 1, strTimestamped.size(), stdout); + fwrite(strTimestamped.data(), 1, strTimestamped.size(), stdout); fflush(stdout); } if (m_print_to_file) { @@ -214,7 +212,6 @@ int BCLog::Logger::LogPrintStr(const std::string &str) // buffer if we haven't opened the log yet if (m_fileout == nullptr) { - ret = strTimestamped.length(); m_msgs_before_open.push_back(strTimestamped); } else @@ -224,15 +221,14 @@ int BCLog::Logger::LogPrintStr(const std::string &str) m_reopen_file = false; m_fileout = fsbridge::freopen(m_file_path, "a", m_fileout); if (!m_fileout) { - return ret; + return; } setbuf(m_fileout, nullptr); // unbuffered } - ret = FileWriteStr(strTimestamped, m_fileout); + FileWriteStr(strTimestamped, m_fileout); } } - return ret; } void BCLog::Logger::ShrinkDebugFile() diff --git a/src/logging.h b/src/logging.h index 1f2be6016..6400b131c 100644 --- a/src/logging.h +++ b/src/logging.h @@ -86,7 +86,7 @@ namespace BCLog { std::atomic m_reopen_file{false}; /** Send a string to the log output */ - int LogPrintStr(const std::string &str); + void LogPrintStr(const std::string &str); /** Returns whether logs will be written to any output */ bool Enabled() const { return m_print_to_console || m_print_to_file; }