Browse Source

Merge pull request #3020 from Diapolo/LogPrint_fixes

fix some printf -> LogPrintf leftovers
0.10
Pieter Wuille 11 years ago
parent
commit
f676fb91f3
  1. 12
      src/util.cpp
  2. 6
      src/wallet.cpp

12
src/util.cpp

@ -198,15 +198,7 @@ uint256 GetRandHash() @@ -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) @@ -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;

6
src/wallet.cpp

@ -1145,11 +1145,11 @@ bool CWallet::SelectCoinsMinConf(int64 nTargetValue, int nConfMine, int nConfThe @@ -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;

Loading…
Cancel
Save