Make sure LogPrintf strings are line-terminated

laanwj · laanwj · commit f18b8ec7cf6e · 2015-08-03T17:40:55.000+02:00
Fix the cases where LogPrint[f] was accidentally called without line terminator, which resulted in concatenated log lines. (see e.g. #6492)
diff --git a/src/main.cpp b/src/main.cpp
@@ -3398,7 +3398,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp)
                     }
                 }
             } catch (const std::exception& e) {
-                LogPrintf("%s: Deserialize or I/O error - %s", __func__, e.what());
+                LogPrintf("%s: Deserialize or I/O error - %s\n", __func__, e.what());
             }
         }
     } catch (const std::runtime_error& e) {
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
@@ -249,7 +249,7 @@ unsigned int TxConfirmStats::NewTx(unsigned int nBlockHeight, double val)
     unsigned int bucketindex = bucketMap.lower_bound(val)->second;
     unsigned int blockIndex = nBlockHeight % unconfTxs.size();
     unconfTxs[blockIndex][bucketindex]++;
-    LogPrint("estimatefee", "adding to %s\n", dataTypeString);
+    LogPrint("estimatefee", "adding to %s", dataTypeString);
     return bucketindex;
 }
 
@@ -390,8 +390,9 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo
         mapMemPoolTxs[hash].bucketIndex = feeStats.NewTx(txHeight, (double)feeRate.GetFeePerK());
     }
     else {
-        LogPrint("estimatefee", "not adding\n");
+        LogPrint("estimatefee", "not adding");
     }
+    LogPrint("estimatefee", "\n");
 }
 
 void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry& entry)
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
@@ -752,14 +752,14 @@ void StopRPCThreads()
     {
         acceptor->cancel(ec);
         if (ec)
-            LogPrintf("%s: Warning: %s when cancelling acceptor", __func__, ec.message());
+            LogPrintf("%s: Warning: %s when cancelling acceptor\n", __func__, ec.message());
     }
     rpc_acceptors.clear();
     BOOST_FOREACH(const PAIRTYPE(std::string, boost::shared_ptr<deadline_timer>) &timer, deadlineTimers)
     {
         timer.second->cancel(ec);
         if (ec)
-            LogPrintf("%s: Warning: %s when cancelling timer", __func__, ec.message());
+            LogPrintf("%s: Warning: %s when cancelling timer\n", __func__, ec.message());
     }
     deadlineTimers.clear();
 
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -348,7 +348,7 @@ CTxMemPool::WriteFeeEstimates(CAutoFile& fileout) const
         minerPolicyEstimator->Write(fileout);
     }
     catch (const std::exception&) {
-        LogPrintf("CTxMemPool::WriteFeeEstimates(): unable to write policy estimator data (non-fatal)");
+        LogPrintf("CTxMemPool::WriteFeeEstimates(): unable to write policy estimator data (non-fatal)\n");
         return false;
     }
     return true;
@@ -367,7 +367,7 @@ CTxMemPool::ReadFeeEstimates(CAutoFile& filein)
         minerPolicyEstimator->Read(filein);
     }
     catch (const std::exception&) {
-        LogPrintf("CTxMemPool::ReadFeeEstimates(): unable to read policy estimator data (non-fatal)");
+        LogPrintf("CTxMemPool::ReadFeeEstimates(): unable to read policy estimator data (non-fatal)\n");
         return false;
     }
     return true;
diff --git a/src/wallet/crypter.cpp b/src/wallet/crypter.cpp
@@ -186,7 +186,7 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)
         }
         if (keyPass && keyFail)
         {
-            LogPrintf("The wallet is probably corrupted: Some keys decrypt but not all.");
+            LogPrintf("The wallet is probably corrupted: Some keys decrypt but not all.\n");
             assert(false);
         }
         if (keyFail || !keyPass)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2109,7 +2109,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
             if (!wtxNew.AcceptToMemoryPool(false))
             {
                 // This must not fail. The transaction has already been signed and recorded.
-                LogPrintf("CommitTransaction(): Error: Transaction not valid");
+                LogPrintf("CommitTransaction(): Error: Transaction not valid\n");
                 return false;
             }
             wtxNew.RelayWalletTransaction();

Original file line number	Diff line number	Diff line change
`@@ -3398,7 +3398,7 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp)`
`3398`	`3398`	`}`
`3399`	`3399`	`}`
`3400`	`3400`	`} catch (const std::exception& e) {`
`3401`		`- LogPrintf("%s: Deserialize or I/O error - %s", __func__, e.what());`
	`3401`	`+ LogPrintf("%s: Deserialize or I/O error - %s\n", __func__, e.what());`
`3402`	`3402`	`}`
`3403`	`3403`	`}`
`3404`	`3404`	`} catch (const std::runtime_error& e) {`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ unsigned int TxConfirmStats::NewTx(unsigned int nBlockHeight, double val)`
`249`	`249`	`unsigned int bucketindex = bucketMap.lower_bound(val)->second;`
`250`	`250`	`unsigned int blockIndex = nBlockHeight % unconfTxs.size();`
`251`	`251`	`unconfTxs[blockIndex][bucketindex]++;`
`252`		`- LogPrint("estimatefee", "adding to %s\n", dataTypeString);`
	`252`	`+ LogPrint("estimatefee", "adding to %s", dataTypeString);`
`253`	`253`	`return bucketindex;`
`254`	`254`	`}`
`255`	`255`
`@@ -390,8 +390,9 @@ void CBlockPolicyEstimator::processTransaction(const CTxMemPoolEntry& entry, boo`
`390`	`390`	`mapMemPoolTxs[hash].bucketIndex = feeStats.NewTx(txHeight, (double)feeRate.GetFeePerK());`
`391`	`391`	`}`
`392`	`392`	`else {`
`393`		`- LogPrint("estimatefee", "not adding\n");`
	`393`	`+ LogPrint("estimatefee", "not adding");`
`394`	`394`	`}`
	`395`	`+ LogPrint("estimatefee", "\n");`
`395`	`396`	`}`
`396`	`397`
`397`	`398`	`void CBlockPolicyEstimator::processBlockTx(unsigned int nBlockHeight, const CTxMemPoolEntry& entry)`
Original file line number	Diff line number	Diff line change
`@@ -752,14 +752,14 @@ void StopRPCThreads()`
`752`	`752`	`{`
`753`	`753`	`acceptor->cancel(ec);`
`754`	`754`	`if (ec)`
`755`		`- LogPrintf("%s: Warning: %s when cancelling acceptor", __func__, ec.message());`
	`755`	`+ LogPrintf("%s: Warning: %s when cancelling acceptor\n", __func__, ec.message());`
`756`	`756`	`}`
`757`	`757`	`rpc_acceptors.clear();`
`758`	`758`	`BOOST_FOREACH(const PAIRTYPE(std::string, boost::shared_ptr<deadline_timer>) &timer, deadlineTimers)`
`759`	`759`	`{`
`760`	`760`	`timer.second->cancel(ec);`
`761`	`761`	`if (ec)`
`762`		`- LogPrintf("%s: Warning: %s when cancelling timer", __func__, ec.message());`
	`762`	`+ LogPrintf("%s: Warning: %s when cancelling timer\n", __func__, ec.message());`
`763`	`763`	`}`
`764`	`764`	`deadlineTimers.clear();`
`765`	`765`
Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ CTxMemPool::WriteFeeEstimates(CAutoFile& fileout) const`
`348`	`348`	`minerPolicyEstimator->Write(fileout);`
`349`	`349`	`}`
`350`	`350`	`catch (const std::exception&) {`
`351`		`- LogPrintf("CTxMemPool::WriteFeeEstimates(): unable to write policy estimator data (non-fatal)");`
	`351`	`+ LogPrintf("CTxMemPool::WriteFeeEstimates(): unable to write policy estimator data (non-fatal)\n");`
`352`	`352`	`return false;`
`353`	`353`	`}`
`354`	`354`	`return true;`
`@@ -367,7 +367,7 @@ CTxMemPool::ReadFeeEstimates(CAutoFile& filein)`
`367`	`367`	`minerPolicyEstimator->Read(filein);`
`368`	`368`	`}`
`369`	`369`	`catch (const std::exception&) {`
`370`		`- LogPrintf("CTxMemPool::ReadFeeEstimates(): unable to read policy estimator data (non-fatal)");`
	`370`	`+ LogPrintf("CTxMemPool::ReadFeeEstimates(): unable to read policy estimator data (non-fatal)\n");`
`371`	`371`	`return false;`
`372`	`372`	`}`
`373`	`373`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ bool CCryptoKeyStore::Unlock(const CKeyingMaterial& vMasterKeyIn)`
`186`	`186`	`}`
`187`	`187`	`if (keyPass && keyFail)`
`188`	`188`	`{`
`189`		`- LogPrintf("The wallet is probably corrupted: Some keys decrypt but not all.");`
	`189`	`+ LogPrintf("The wallet is probably corrupted: Some keys decrypt but not all.\n");`
`190`	`190`	`assert(false);`
`191`	`191`	`}`
`192`	`192`	`if (keyFail \|\| !keyPass)`
Original file line number	Diff line number	Diff line change
`@@ -2109,7 +2109,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)`
`2109`	`2109`	`if (!wtxNew.AcceptToMemoryPool(false))`
`2110`	`2110`	`{`
`2111`	`2111`	`// This must not fail. The transaction has already been signed and recorded.`
`2112`		`- LogPrintf("CommitTransaction(): Error: Transaction not valid");`
	`2112`	`+ LogPrintf("CommitTransaction(): Error: Transaction not valid\n");`
`2113`	`2113`	`return false;`
`2114`	`2114`	`}`
`2115`	`2115`	`wtxNew.RelayWalletTransaction();`