From faaeae1eb3b7a1e2d558b52508cbe890ce5ea37e Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Thu, 19 Sep 2013 14:47:21 +0200 Subject: [PATCH] fix some printf -> LogPrintf leftovers --- src/main.h | 2 +- src/util.cpp | 12 ++---------- src/wallet.cpp | 6 +++--- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/main.h b/src/main.h index 7ce353d082..0355214648 100644 --- a/src/main.h +++ b/src/main.h @@ -1214,7 +1214,7 @@ public: @see CTransaction::FetchInputs */ int64 GetValueIn(const CTransaction& tx); - + // Check whether all prevouts of the transaction are present in the UTXO set represented by this view bool HaveInputs(const CTransaction& tx); diff --git a/src/util.cpp b/src/util.cpp index 281ced2fa9..73428b4c22 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -198,15 +198,7 @@ uint256 GetRandHash() return hash; } - - - - - - -// -// OutputDebugStringF (aka printf -- there is a #define that we really -// should get rid of one day) has been broken a couple of times now +// LogPrintf() has been broken a couple of times now // by well-meaning people adding mutexes in the most straightforward way. // It breaks because it may be called by global destructors during shutdown. // Since the order of destruction of static/global objects is undefined, @@ -1065,7 +1057,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific) fs::path &path = pathCached[nNet]; - // This can be called during exceptions by printf, so we cache the + // This can be called during exceptions by LogPrintf(), so we cache the // value so we don't have to do memory allocations after that. if (!path.empty()) return path; diff --git a/src/wallet.cpp b/src/wallet.cpp index 91de93da7a..26ffc71e19 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -1145,11 +1145,11 @@ bool CWallet::SelectCoinsMinConf(int64 nTargetValue, int nConfMine, int nConfThe nValueRet += vValue[i].first; } - LogPrintf("selectcoins", "SelectCoins() best subset: "); + LogPrint("selectcoins", "SelectCoins() best subset: "); for (unsigned int i = 0; i < vValue.size(); i++) if (vfBest[i]) - LogPrintf("selectcoins", "%s ", FormatMoney(vValue[i].first).c_str()); - LogPrintf("selectcoins", "total %s\n", FormatMoney(nBest).c_str()); + LogPrint("selectcoins", "%s ", FormatMoney(vValue[i].first).c_str()); + LogPrint("selectcoins", "total %s\n", FormatMoney(nBest).c_str()); } return true;