From d9ff3d77a30a80c3fa80c78926669ca462506eb8 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Wed, 9 Sep 2015 21:34:52 +0300 Subject: [PATCH] remove extra "new line" from some error/log messages Closes #609 --- src/darksend.cpp | 8 ++++---- src/masternode-budget.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/darksend.cpp b/src/darksend.cpp index 2168fee8b..7b0487e06 100644 --- a/src/darksend.cpp +++ b/src/darksend.cpp @@ -946,7 +946,7 @@ bool CDarksendPool::IsCollateralValid(const CTransaction& txCollateral){ nValueOut += o.nValue; if(!o.scriptPubKey.IsNormalPaymentScript()){ - LogPrintf ("CDarksendPool::IsCollateralValid - Invalid Script %s\n", txCollateral.ToString()); + LogPrintf ("CDarksendPool::IsCollateralValid - Invalid Script %s", txCollateral.ToString()); return false; } } @@ -964,17 +964,17 @@ bool CDarksendPool::IsCollateralValid(const CTransaction& txCollateral){ } if(missingTx){ - LogPrint("darksend", "CDarksendPool::IsCollateralValid - Unknown inputs in collateral transaction - %s\n", txCollateral.ToString()); + LogPrint("darksend", "CDarksendPool::IsCollateralValid - Unknown inputs in collateral transaction - %s", txCollateral.ToString()); return false; } //collateral transactions are required to pay out DARKSEND_COLLATERAL as a fee to the miners if(nValueIn - nValueOut < DARKSEND_COLLATERAL) { - LogPrint("darksend", "CDarksendPool::IsCollateralValid - did not include enough fees in transaction %d\n%s\n", nValueOut-nValueIn, txCollateral.ToString()); + LogPrint("darksend", "CDarksendPool::IsCollateralValid - did not include enough fees in transaction %d\n%s", nValueOut-nValueIn, txCollateral.ToString()); return false; } - LogPrint("darksend", "CDarksendPool::IsCollateralValid %s\n", txCollateral.ToString()); + LogPrint("darksend", "CDarksendPool::IsCollateralValid %s", txCollateral.ToString()); { LOCK(cs_main); diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp index b764cf24c..cb8a79272 100644 --- a/src/masternode-budget.cpp +++ b/src/masternode-budget.cpp @@ -1366,12 +1366,12 @@ bool CBudgetProposal::AddOrUpdateVote(CBudgetVote& vote, std::string& strError) if(mapVotes.count(hash)){ if(mapVotes[hash].nTime > vote.nTime){ - strError = strprintf("new vote older than existing vote - %s\n", vote.GetHash().ToString()); + strError = strprintf("new vote older than existing vote - %s", vote.GetHash().ToString()); LogPrint("mnbudget", "CBudgetProposal::AddOrUpdateVote - %s\n", strError); return false; } if(vote.nTime - mapVotes[hash].nTime < BUDGET_VOTE_UPDATE_MIN){ - strError = strprintf("time between votes is too soon - %s - %lli\n", vote.GetHash().ToString(), vote.nTime - mapVotes[hash].nTime); + strError = strprintf("time between votes is too soon - %s - %lli", vote.GetHash().ToString(), vote.nTime - mapVotes[hash].nTime); LogPrint("mnbudget", "CBudgetProposal::AddOrUpdateVote - %s\n", strError); return false; } @@ -1618,19 +1618,19 @@ bool CFinalizedBudget::AddOrUpdateVote(CFinalizedBudgetVote& vote, std::string& uint256 hash = vote.vin.prevout.GetHash(); if(mapVotes.count(hash)){ if(mapVotes[hash].nTime > vote.nTime){ - strError = strprintf("new vote older than existing vote - %s\n", vote.GetHash().ToString()); + strError = strprintf("new vote older than existing vote - %s", vote.GetHash().ToString()); LogPrint("mnbudget", "CFinalizedBudget::AddOrUpdateVote - %s\n", strError); return false; } if(vote.nTime - mapVotes[hash].nTime < BUDGET_VOTE_UPDATE_MIN){ - strError = strprintf("time between votes is too soon - %s - %lli\n", vote.GetHash().ToString(), vote.nTime - mapVotes[hash].nTime); + strError = strprintf("time between votes is too soon - %s - %lli", vote.GetHash().ToString(), vote.nTime - mapVotes[hash].nTime); LogPrint("mnbudget", "CFinalizedBudget::AddOrUpdateVote - %s\n", strError); return false; } } if(vote.nTime > GetTime() + (60*60)){ - strError = strprintf("new vote is too far ahead of current time - %s - nTime %lli - Max Time %lli\n", vote.GetHash().ToString(), vote.nTime, GetTime() + (60*60)); + strError = strprintf("new vote is too far ahead of current time - %s - nTime %lli - Max Time %lli", vote.GetHash().ToString(), vote.nTime, GetTime() + (60*60)); LogPrint("mnbudget", "CFinalizedBudget::AddOrUpdateVote - %s\n", strError); return false; }