diff options
author | Jeff Garzik <jgarzik@exmulti.com> | 2012-11-15 18:20:35 -0800 |
---|---|---|
committer | Jeff Garzik <jgarzik@exmulti.com> | 2012-11-15 18:20:35 -0800 |
commit | 824e19605487a0e6a36c212ef23ac31cb643dc90 (patch) | |
tree | 250b31979b8159f2f16e6efdaa96e47c69ef3293 | |
parent | a0bf93b80958eb77f95f3f3a42aca31b7ffe73c7 (diff) | |
parent | 13e5cce4c3df5c3d66bb37eb8e169fce02095840 (diff) | |
download | bitcoin-824e19605487a0e6a36c212ef23ac31cb643dc90.tar.xz |
Merge pull request #2005 from Diapolo/fixes_main
some small fixes for main.cpp/.h
-rw-r--r-- | src/main.cpp | 8 | ||||
-rw-r--r-- | src/main.h | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index e6f0d9ef51..346ed73323 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -719,7 +719,7 @@ bool CTxMemPool::accept(CTransaction &tx, bool fCheckInputs, // are the actual inputs available? if (!tx.HaveInputs(view)) return error("CTxMemPool::accept() : inputs already spent"); - + // Bring the best block into scope view.GetBestBlock(); @@ -1338,7 +1338,7 @@ bool CTransaction::CheckInputs(CCoinsViewCache &inputs, enum CheckSig_mode csmod // While checking, GetBestBlock() refers to the parent block. // This is also true for mempool checks. - int nSpendHeight = inputs.GetBestBlock()->nHeight + 1; + int nSpendHeight = inputs.GetBestBlock()->nHeight + 1; int64 nValueIn = 0; int64 nFees = 0; for (unsigned int i = 0; i < vin.size(); i++) @@ -1899,8 +1899,8 @@ bool FindBlockPos(CDiskBlockPos &pos, unsigned int nAddSize, unsigned int nHeigh if (file) { printf("Pre-allocating up to position 0x%x in blk%05u.dat\n", nNewChunks * BLOCKFILE_CHUNK_SIZE, pos.nFile); AllocateFileRange(file, pos.nPos, nNewChunks * BLOCKFILE_CHUNK_SIZE - pos.nPos); + fclose(file); } - fclose(file); } } @@ -1941,8 +1941,8 @@ bool FindUndoPos(int nFile, CDiskBlockPos &pos, unsigned int nAddSize) if (file) { printf("Pre-allocating up to position 0x%x in rev%05u.dat\n", nNewChunks * UNDOFILE_CHUNK_SIZE, pos.nFile); AllocateFileRange(file, pos.nPos, nNewChunks * UNDOFILE_CHUNK_SIZE - pos.nPos); + fclose(file); } - fclose(file); } return true; diff --git a/src/main.h b/src/main.h index 622875d4a9..ab341af6fe 100644 --- a/src/main.h +++ b/src/main.h @@ -733,7 +733,6 @@ public: bool WriteToDisk(CDiskBlockPos &pos) { - // Open history file to append CAutoFile fileout = CAutoFile(OpenUndoFile(pos), SER_DISK, CLIENT_VERSION); if (!fileout) @@ -746,7 +745,7 @@ public: // Write undo data long fileOutPos = ftell(fileout); if (fileOutPos < 0) - return error("CBlock::WriteToDisk() : ftell failed"); + return error("CBlockUndo::WriteToDisk() : ftell failed"); pos.nPos = (unsigned int)fileOutPos; fileout << *this; @@ -757,7 +756,6 @@ public: return true; } - }; /** pruned version of CTransaction: only retains metadata and unspent transaction outputs @@ -1872,7 +1870,7 @@ public: virtual bool GetStats(CCoinsStats &stats); // As we use CCoinsViews polymorphically, have a virtual destructor - virtual ~CCoinsView() {}; + virtual ~CCoinsView() {} }; /** CCoinsView backed by another CCoinsView */ |