aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/unit-tests.txt4
-rw-r--r--src/main.cpp6
-rw-r--r--src/script.cpp2
-rw-r--r--src/util.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/doc/unit-tests.txt b/doc/unit-tests.txt
index 671ec3e719..9bc4cfa44b 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 d5d4605ea1..ef59d31f9a 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<uint256, CTxIndex>& 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 dd53f903dc..d8b24944b0 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 fb3bc64cc8..49415fc3b7 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;