From 3171daef6c106023a5fcbc80e66c0e0a9552c4d8 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 26 Jul 2012 00:48:39 +0000 Subject: [PATCH] Bugfix: Fix a variety of misspellings --- src/addrman.h | 2 +- src/main.cpp | 2 +- src/netbase.cpp | 2 +- src/netbase.h | 4 ++-- src/qt/bitcoin.cpp | 2 +- src/script.cpp | 4 ++-- src/test/script_P2SH_tests.cpp | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/addrman.h b/src/addrman.h index e89fbba9f1b..1ccde823615 100644 --- a/src/addrman.h +++ b/src/addrman.h @@ -116,7 +116,7 @@ public: // * Bucket selection is based on cryptographic hashing, using a randomly-generated 256-bit key, which should not // be observable by adversaries. // * Several indexes are kept for high performance. Defining DEBUG_ADDRMAN will introduce frequent (and expensive) -// consistency checks for the entire datastructure. +// consistency checks for the entire data structure. // total number of buckets for tried addresses #define ADDRMAN_TRIED_BUCKET_COUNT 64 diff --git a/src/main.cpp b/src/main.cpp index 4bd63bb26b4..ac26fd7ff62 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1565,7 +1565,7 @@ bool CBlock::SetBestChain(CTxDB& txdb, CBlockIndex* pindexNew) return error("SetBestChain() : Reorganize failed"); } - // Connect futher blocks + // Connect further blocks BOOST_REVERSE_FOREACH(CBlockIndex *pindex, vpindexSecondary) { CBlock block; diff --git a/src/netbase.cpp b/src/netbase.cpp index 2f2457ade62..84038ffb45d 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -549,7 +549,7 @@ std::vector CNetAddr::GetGroup() const nClass = 1; nStartByte = 2; } - // for Teredo-tunneled IPv6 addresses, use the encapsulated IPv4 address + // for Teredo-tunnelled IPv6 addresses, use the encapsulated IPv4 address else if (IsRFC4380()) { vchRet.push_back(1); diff --git a/src/netbase.h b/src/netbase.h index 24e94f2a2da..2543a022489 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -45,9 +45,9 @@ class CNetAddr bool IsRFC1918() const; // IPv4 private networks (10.0.0.0/8, 192.168.0.0/16, 172.16.0.0/12) bool IsRFC3849() const; // IPv6 documentation address (2001:0DB8::/32) bool IsRFC3927() const; // IPv4 autoconfig (169.254.0.0/16) - bool IsRFC3964() const; // IPv6 6to4 tunneling (2002::/16) + bool IsRFC3964() const; // IPv6 6to4 tunnelling (2002::/16) bool IsRFC4193() const; // IPv6 unique local (FC00::/15) - bool IsRFC4380() const; // IPv6 Teredo tunneling (2001::/32) + bool IsRFC4380() const; // IPv6 Teredo tunnelling (2001::/32) bool IsRFC4843() const; // IPv6 ORCHID (2001:10::/28) bool IsRFC4862() const; // IPv6 autoconfig (FE80::/64) bool IsRFC6052() const; // IPv6 well-known prefix (64:FF9B::/96) diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index ddf7aa95a5b..d08e8d6aa0b 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -269,7 +269,7 @@ int main(int argc, char *argv[]) window.show(); } - // Place this here as guiref has to be defined if we dont want to lose URIs + // Place this here as guiref has to be defined if we don't want to lose URIs ipcInit(); #if !defined(MAC_OSX) && !defined(WIN32) diff --git a/src/script.cpp b/src/script.cpp index 6a5f3f78e76..1fc53440d98 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1195,7 +1195,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector& multisigdata, const CKeyStore& keystore, uint2 // Sign scriptPubKey with private keys stored in keystore, given transaction hash and hash type. // Signatures are returned in scriptSigRet (or returns false if scriptPubKey can't be signed), // unless whichTypeRet is TX_SCRIPTHASH, in which case scriptSigRet is the redemption script. -// Returns false if scriptPubKey could not be completely satisified. +// Returns false if scriptPubKey could not be completely satisfied. // bool Solver(const CKeyStore& keystore, const CScript& scriptPubKey, uint256 hash, int nHashType, CScript& scriptSigRet, txnouttype& whichTypeRet) diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index aa72c00092c..b84b9037213 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE(norecurse) // Should not verify, because it will try to execute OP_INVALIDOPCODE BOOST_CHECK(!Verify(scriptSig, p2sh, true)); - // Try to recurse, and verification should succeed because + // Try to recur, and verification should succeed because // the inner HASH160 <> EQUAL should only check the hash: CScript p2sh2; p2sh2.SetPayToScriptHash(p2sh); @@ -225,7 +225,7 @@ BOOST_AUTO_TEST_CASE(is) BOOST_AUTO_TEST_CASE(switchover) { - // Test switchover code + // Test switch over code CScript notValid; notValid << OP_11 << OP_12 << OP_EQUALVERIFY; CScript scriptSig;