From 8911ac0b27510914efbfed80ddfb7f19757ac102 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 26 Jul 2012 03:12:12 +0000 Subject: [PATCH 1/3] Bugfix: Use standard BTC unit in comments --- src/main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.h b/src/main.h index 7aa660dba79..4edea5ed46e 100644 --- a/src/main.h +++ b/src/main.h @@ -558,7 +558,7 @@ public: if (nBlockSize == 1) { // Transactions under 10K are free - // (about 4500bc if made of 50bc inputs) + // (about 4500 BTC if made of 50 BTC inputs) if (nBytes < 10000) nMinFee = 0; } From 448f6b3d9b6d598f6a3db7807934d10fe94d5a71 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 26 Jul 2012 03:25:26 +0000 Subject: [PATCH 2/3] Bugfix: Correct English grammar regarding "'s" --- doc/unit-tests.txt | 4 ++-- src/main.cpp | 6 +++--- src/script.cpp | 2 +- src/util.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/unit-tests.txt b/doc/unit-tests.txt index 671ec3e7198..9bc4cfa44b0 100644 --- a/doc/unit-tests.txt +++ b/doc/unit-tests.txt @@ -12,7 +12,7 @@ make -f makefile.unix test_bitcoin # Replace makefile.unix if you're not on uni If all tests succeed the last line of output will be: *** No errors detected -To add more tests, add BOOST_AUTO_TEST_CASE's to the existing +To add more tests, add BOOST_AUTO_TEST_CASE functions to the existing .cpp files in the test/ directory or add new .cpp files that -implement new BOOST_AUTO_TEST_SUITE's (and add them to the +implement new BOOST_AUTO_TEST_SUITE sections (and add them to the list of includes in test_bitcoin.cpp). diff --git a/src/main.cpp b/src/main.cpp index d5d4605ea17..ef59d31f9a8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -462,7 +462,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi // Continuously rate-limit free transactions // This mitigates 'penny-flooding' -- sending thousands of free transactions just to - // be annoying or make other's transactions take longer to confirm. + // be annoying or make others' transactions take longer to confirm. if (nFees < MIN_RELAY_TX_FEE) { static CCriticalSection cs; @@ -944,7 +944,7 @@ bool CTransaction::FetchInputs(CTxDB& txdb, const map& mapTes } } - // Make sure all prevout.n's are valid: + // Make sure all prevout.n indexes are valid: for (unsigned int i = 0; i < vin.size(); i++) { const COutPoint prevout = vin[i].prevout; @@ -1172,7 +1172,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex) // being sent to another address. // See BIP30 and http://r6.ca/blog/20120206T005236Z.html for more information. // This logic is not necessary for memory pool transactions, as AcceptToMemoryPool - // already refuses previously-known transaction id's entirely. + // already refuses previously-known transaction ids entirely. // This rule applies to all blocks whose timestamp is after March 15, 2012, 0:00 UTC. // On testnet it is enabled as of februari 20, 2012, 0:00 UTC. if (pindex->nTime > 1331769600 || (fTestNet && pindex->nTime > 1329696000)) diff --git a/src/script.cpp b/src/script.cpp index dd53f903dc6..d8b24944b0d 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1268,7 +1268,7 @@ int CScript::GetSigOpCount(const CScript& scriptSig) const return 0; } - /// ... and return it's opcount: + /// ... and return its opcount: CScript subscript(data.begin(), data.end()); return subscript.GetSigOpCount(true); } diff --git a/src/util.cpp b/src/util.cpp index fb3bc64cc89..49415fc3b73 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -354,7 +354,7 @@ string FormatMoney(int64 n, bool fPlus) int64 remainder = n_abs%COIN; string str = strprintf("%"PRI64d".%08"PRI64d, quotient, remainder); - // Right-trim excess 0's before the decimal point: + // Right-trim excess zeros before the decimal point: int nTrim = 0; for (int i = str.size()-1; (str[i] == '0' && isdigit(str[i-2])); --i) ++nTrim; From 566f556c40069ed06c8b734433a2859f4917d242 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 26 Jul 2012 03:25:26 +0000 Subject: [PATCH 3/3] Bugfix: Correct English grammar regarding "'s" --- doc/Doxyfile | 2 +- src/init.cpp | 2 +- src/qt/bitcoin.cpp | 2 +- src/qt/bitcoinunits.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/Doxyfile b/doc/Doxyfile index 08d4f8c37fe..c32d0f8959a 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -203,7 +203,7 @@ TAB_SIZE = 8 # For example adding "sideeffect=\par Side Effects:\n" will allow you to # put the command \sideeffect (or @sideeffect) in the documentation, which # will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. +# You can put \n in the value part of an alias to insert newlines. ALIASES = diff --git a/src/init.cpp b/src/init.cpp index 172e66a27ad..4d016956e66 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -78,7 +78,7 @@ void Shutdown(void* parg) printf("Bitcoin exiting\n\n"); fExit = true; #ifndef QT_GUI - // ensure non-UI client get's exited here, but let Bitcoin-Qt reach return 0; in bitcoin.cpp + // ensure non-UI client gets exited here, but let Bitcoin-Qt reach 'return 0;' in bitcoin.cpp exit(0); #endif } diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 6debec703ad..debd2805090 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -213,7 +213,7 @@ int main(int argc, char *argv[]) window.hide(); guiref = 0; } - // Shutdown the core and it's threads, but don't exit Bitcoin-Qt here + // Shutdown the core and its threads, but don't exit Bitcoin-Qt here Shutdown(NULL); } else diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index 9a9a4890dcc..d4715abaecd 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -99,7 +99,7 @@ QString BitcoinUnits::format(int unit, qint64 n, bool fPlus) QString quotient_str = QString::number(quotient); QString remainder_str = QString::number(remainder).rightJustified(num_decimals, '0'); - // Right-trim excess 0's after the decimal point + // Right-trim excess zeros after the decimal point int nTrim = 0; for (int i = remainder_str.size()-1; i>=2 && (remainder_str.at(i) == '0'); --i) ++nTrim;