From 69e077471434b4eb34ec4574c47f83956c51fa63 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Fri, 18 Jan 2013 15:07:05 +0100 Subject: [PATCH] small changes in init, main, checkpoints.h and bitcoin-qt.pro - remove an unneeded MODAL flag, as MSG_ERROR sets MODAL - re-order an if-clause in main to have bool checks before a function call - fix some log messages that used wrong function names - make a log message use a correct ellipsis - remove some unneded spaces, brackets and line-breaks - fix style for adding files in the Qt project --- bitcoin-qt.pro | 9 ++++----- src/checkpoints.h | 2 +- src/init.cpp | 2 +- src/main.cpp | 24 +++++++++++------------- src/main.h | 5 ++--- 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 1c6bc0a6..c527b76d 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -206,7 +206,8 @@ HEADERS += src/qt/bitcoingui.h \ src/leveldb.h \ src/threadsafety.h -SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ +SOURCES += src/qt/bitcoin.cpp \ + src/qt/bitcoingui.cpp \ src/qt/transactiontablemodel.cpp \ src/qt/addresstablemodel.cpp \ src/qt/optionsdialog.cpp \ @@ -270,11 +271,9 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/leveldb.cpp \ src/txdb.cpp -RESOURCES += \ - src/qt/bitcoin.qrc +RESOURCES += src/qt/bitcoin.qrc -FORMS += \ - src/qt/forms/sendcoinsdialog.ui \ +FORMS += src/qt/forms/sendcoinsdialog.ui \ src/qt/forms/addressbookpage.ui \ src/qt/forms/signverifymessagedialog.ui \ src/qt/forms/aboutdialog.ui \ diff --git a/src/checkpoints.h b/src/checkpoints.h index 70e93656..240bd12f 100644 --- a/src/checkpoints.h +++ b/src/checkpoints.h @@ -2,7 +2,7 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. #ifndef BITCOIN_CHECKPOINT_H -#define BITCOIN_CHECKPOINT_H +#define BITCOIN_CHECKPOINT_H #include diff --git a/src/init.cpp b/src/init.cpp index 99e89d9e..cf49831b 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -497,7 +497,7 @@ bool AppInit2() nScriptCheckThreads = GetArg("-par", 0); if (nScriptCheckThreads == 0) nScriptCheckThreads = boost::thread::hardware_concurrency(); - if (nScriptCheckThreads <= 1) + if (nScriptCheckThreads <= 1) nScriptCheckThreads = 0; else if (nScriptCheckThreads > MAX_SCRIPTCHECK_THREADS) nScriptCheckThreads = MAX_SCRIPTCHECK_THREADS; diff --git a/src/main.cpp b/src/main.cpp index 3151a806..9fde08b2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -454,8 +454,7 @@ bool CTransaction::AreInputsStandard(CCoinsViewCache& mapInputs) const return true; } -unsigned int -CTransaction::GetLegacySigOpCount() const +unsigned int CTransaction::GetLegacySigOpCount() const { unsigned int nSigOps = 0; BOOST_FOREACH(const CTxIn& txin, vin) @@ -1176,7 +1175,7 @@ int GetNumBlocksOfPeers() bool IsInitialBlockDownload() { - if (pindexBest == NULL || nBestHeight < Checkpoints::GetTotalBlocksEstimate() || fReindex || fImporting) + if (pindexBest == NULL || fImporting || fReindex || nBestHeight < Checkpoints::GetTotalBlocksEstimate()) return true; static int64 nLastUpdate; static CBlockIndex* pindexLastBest; @@ -1629,7 +1628,6 @@ bool CBlock::ConnectBlock(CValidationState &state, CBlockIndex* pindex, CCoinsVi vPos.reserve(vtx.size()); for (unsigned int i=0; iGetBlockHash()).c_str()); } if (fBenchmark) - printf("- Connect: %.2fms\n", (GetTimeMicros() - nStart) * 0.001); + printf("- Connect: %.2fms\n", (GetTimeMicros() - nStart) * 0.001); // Queue memory transactions to delete BOOST_FOREACH(const CTransaction& tx, block.vtx) @@ -2444,7 +2442,7 @@ bool AbortNode(const std::string &strMessage) { fRequestShutdown = true; strMiscWarning = strMessage; printf("*** %s\n", strMessage.c_str()); - uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_ERROR | CClientUIInterface::MODAL); + uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_ERROR); StartShutdown(); return false; } @@ -2491,7 +2489,7 @@ FILE* OpenBlockFile(const CDiskBlockPos &pos, bool fReadOnly) { return OpenDiskFile(pos, "blk", fReadOnly); } -FILE *OpenUndoFile(const CDiskBlockPos &pos, bool fReadOnly) { +FILE* OpenUndoFile(const CDiskBlockPos &pos, bool fReadOnly) { return OpenDiskFile(pos, "rev", fReadOnly); } @@ -2543,9 +2541,9 @@ bool static LoadBlockIndexDB() // Load block file info pblocktree->ReadLastBlockFile(nLastBlockFile); - printf("LoadBlockIndex(): last block file = %i\n", nLastBlockFile); + printf("LoadBlockIndexDB(): last block file = %i\n", nLastBlockFile); if (pblocktree->ReadBlockFileInfo(nLastBlockFile, infoLastBlockFile)) - printf("LoadBlockIndex(): last block file: %s\n", infoLastBlockFile.ToString().c_str()); + printf("LoadBlockIndexDB(): last block file info: %s\n", infoLastBlockFile.ToString().c_str()); // Load bnBestInvalidWork, OK if it doesn't exist pblocktree->ReadBestInvalidWork(bnBestInvalidWork); @@ -2557,7 +2555,7 @@ bool static LoadBlockIndexDB() // Check whether we have a transaction index pblocktree->ReadFlag("txindex", fTxIndex); - printf("LoadBlockIndex(): transaction index %s\n", fTxIndex ? "enabled" : "disabled"); + printf("LoadBlockIndexDB(): transaction index %s\n", fTxIndex ? "enabled" : "disabled"); // Load hashBestChain pointer to end of best chain pindexBest = pcoinsTip->GetBestBlock(); @@ -2574,7 +2572,7 @@ bool static LoadBlockIndexDB() pindexPrev->pnext = pindex; pindex = pindexPrev; } - printf("LoadBlockIndex(): hashBestChain=%s height=%d date=%s\n", + printf("LoadBlockIndexDB(): hashBestChain=%s height=%d date=%s\n", BlockHashStr(hashBestChain).c_str(), nBestHeight, DateTimeStrFormat("%Y-%m-%d %H:%M:%S", pindexBest->GetBlockTime()).c_str()); @@ -2743,7 +2741,7 @@ bool InitBlockIndex() { CDiskBlockPos blockPos; CValidationState state; if (!FindBlockPos(state, blockPos, nBlockSize+8, 0, block.nTime)) - return error("AcceptBlock() : FindBlockPos failed"); + return error("LoadBlockIndex() : FindBlockPos failed"); if (!block.WriteToDisk(blockPos)) return error("LoadBlockIndex() : writing genesis block to disk failed"); if (!block.AddToBlockIndex(state, blockPos)) @@ -3305,7 +3303,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) { CMerkleBlock merkleBlock(block, *pfrom->pfilter); pfrom->PushMessage("merkleblock", merkleBlock); - // CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see + // CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see // This avoids hurting performance by pointlessly requiring a round-trip // Note that there is currently no way for a node to request any single transactions we didnt send here - // they must either disconnect and retry or request the full block. diff --git a/src/main.h b/src/main.h index 4a217d17..e9601c3a 100644 --- a/src/main.h +++ b/src/main.h @@ -28,7 +28,7 @@ struct CBlockIndexWorkComparator; static const unsigned int MAX_BLOCK_SIZE = 1000000; /** The maximum size for mined blocks */ static const unsigned int MAX_BLOCK_SIZE_GEN = MAX_BLOCK_SIZE/2; -/** The maximum size for transactions we're willing to relay/mine **/ +/** The maximum size for transactions we're willing to relay/mine */ static const unsigned int MAX_STANDARD_TX_SIZE = MAX_BLOCK_SIZE_GEN/5; /** The maximum allowed number of signature check operations in a block (network rule) */ static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50; @@ -118,7 +118,6 @@ class CValidationState; struct CBlockTemplate; - /** Register a wallet to receive updates from core */ void RegisterWallet(CWallet* pwalletIn); /** Unregister a wallet from core */ @@ -1549,7 +1548,7 @@ public: } std::string ToString() const { - return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u..%u, time=%s..%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst).c_str(), DateTimeStrFormat("%Y-%m-%d", nTimeLast).c_str()); + return strprintf("CBlockFileInfo(blocks=%u, size=%u, heights=%u...%u, time=%s...%s)", nBlocks, nSize, nHeightFirst, nHeightLast, DateTimeStrFormat("%Y-%m-%d", nTimeFirst).c_str(), DateTimeStrFormat("%Y-%m-%d", nTimeLast).c_str()); } // update statistics (does not update nSize)