LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

logging: remove unused return value from LogPrintStr

Browse source 
`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
This commit is contained in:
practicalswift 2018-05-02 11:25:20 +02:00
parent 76f344de6d
commit 0bd4cd398b
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/logging.cpp
View file

@ -198,15 +198,13 @@ std::string BCLog::Logger::LogTimestampStr(const std::string &str)
return strStamped; 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); std::string strTimestamped = LogTimestampStr(str);
if (m_print_to_console) { if (m_print_to_console) {
// print to console // print to console
ret = fwrite(strTimestamped.data(), 1, strTimestamped.size(), stdout); fwrite(strTimestamped.data(), 1, strTimestamped.size(), stdout);
fflush(stdout); fflush(stdout);
} }
if (m_print_to_file) { 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 // buffer if we haven't opened the log yet
if (m_fileout == nullptr) { if (m_fileout == nullptr) {
ret = strTimestamped.length();
m_msgs_before_open.push_back(strTimestamped); m_msgs_before_open.push_back(strTimestamped);
} }
else else
@ -224,15 +221,14 @@ int BCLog::Logger::LogPrintStr(const std::string &str)
m_reopen_file = false; m_reopen_file = false;
m_fileout = fsbridge::freopen(m_file_path, "a", m_fileout); m_fileout = fsbridge::freopen(m_file_path, "a", m_fileout);
if (!m_fileout) { if (!m_fileout) {
return ret; return;
} }
setbuf(m_fileout, nullptr); // unbuffered setbuf(m_fileout, nullptr); // unbuffered
} }
ret = FileWriteStr(strTimestamped, m_fileout); FileWriteStr(strTimestamped, m_fileout);
} }
} }
return ret;
} }
void BCLog::Logger::ShrinkDebugFile() void BCLog::Logger::ShrinkDebugFile()

2
src/logging.h
View file

@ -86,7 +86,7 @@ namespace BCLog {
std::atomic<bool> m_reopen_file{false}; std::atomic<bool> m_reopen_file{false};
/** Send a string to the log output */ /** 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 */ /** Returns whether logs will be written to any output */
bool Enabled() const { return m_print_to_console || m_print_to_file; } bool Enabled() const { return m_print_to_console || m_print_to_file; }