highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-10 22:18:54 +01:00
Code Issues Packages Projects Releases 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
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;
}
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()