diff options
author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2012-10-05 19:22:21 +0200 |
---|---|---|
committer | Philip Kaufmann <phil.kaufmann@t-online.de> | 2012-10-21 21:32:25 +0200 |
commit | 729b18068689c1a6805d04117ef05f97502f5062 (patch) | |
tree | 0e1e735343dcac684129e7026fc3c6e80e2ab40a /src/main.cpp | |
parent | d44f1ea394d3f0f324f7d61e97fec2b7ba2e865f (diff) |
change blockchain -> block chain (spelling)
- Wiki says "block chain" is correct ;)
- remove some unneeded spaces I found in the source, while fixing the spelling
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index c9e1e163d2..ad5a7b0f19 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1291,7 +1291,7 @@ bool CTransaction::UpdateCoins(CCoinsViewCache &inputs, CTxUndo &txundo, int nHe bool CTransaction::HaveInputs(CCoinsViewCache &inputs) const { - if (!IsCoinBase()) { + if (!IsCoinBase()) { // first check whether information about the prevout hash is available for (unsigned int i = 0; i < vin.size(); i++) { const COutPoint &prevout = vin[i].prevout; @@ -1356,9 +1356,9 @@ bool CTransaction::CheckInputs(CCoinsViewCache &inputs, enum CheckSig_mode csmod // Helps prevent CPU exhaustion attacks. // Skip ECDSA signature verification when connecting blocks - // before the last blockchain checkpoint. This is safe because block merkle hashes are + // before the last block chain checkpoint. This is safe because block merkle hashes are // still computed and checked, and any change will be caught at the next checkpoint. - if (csmode == CS_ALWAYS || + if (csmode == CS_ALWAYS || (csmode == CS_AFTER_CHECKPOINT && inputs.GetBestBlock()->nHeight >= Checkpoints::GetTotalBlocksEstimate())) { for (unsigned int i = 0; i < vin.size(); i++) { const COutPoint &prevout = vin[i].prevout; @@ -1620,7 +1620,7 @@ bool CBlock::ConnectBlock(CBlockIndex* pindex, CCoinsViewCache &view, bool fJust return error("ConnectBlock() : WriteBlockIndex failed"); } - // add this block to the view's blockchain + // add this block to the view's block chain if (!view.SetBestBlock(pindex)) return false; @@ -2258,7 +2258,7 @@ bool static LoadBlockIndexDB() printf("LoadBlockIndex(): last block file = %i\n", nLastBlockFile); if (pblocktree->ReadBlockFileInfo(nLastBlockFile, infoLastBlockFile)) printf("LoadBlockIndex(): last block file: %s\n", infoLastBlockFile.ToString().c_str()); - + // Load hashBestChain pointer to end of best chain pindexBest = pcoinsTip->GetBestBlock(); if (pindexBest == NULL) |