From 9e98fe6f584d8bdd0ffe4d5dc5c0b908beb456db 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 (PARTIAL: Left out anything changing debug.log) --- doc/coding.txt | 4 ++-- src/base58.h | 2 +- src/crypter.cpp | 4 ++-- src/init.cpp | 4 ++-- src/irc.cpp | 2 +- src/main.cpp | 26 +++++++++++++------------- src/net.cpp | 10 +++++----- src/protocol.cpp | 2 +- src/rpc.cpp | 6 +++--- src/script.cpp | 2 +- src/wallet.cpp | 4 ++-- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/doc/coding.txt b/doc/coding.txt index b3c812a4865..cc41850a5c7 100644 --- a/doc/coding.txt +++ b/doc/coding.txt @@ -22,8 +22,8 @@ bool Function(char* psz, int n) - No extra spaces inside parenthesis; please don't do ( this ) - No space after function names, one space after if, for and while -Variable names begin with the type in lowercase, like nSomeVariable. -Please don't put the first word of the variable name in lowercase like +Variable names begin with the type in lower-case, like nSomeVariable. +Please don't put the first word of the variable name in lower-case like someVariable. Common types: diff --git a/src/base58.h b/src/base58.h index 43f3ac2881e..af1022dfc07 100644 --- a/src/base58.h +++ b/src/base58.h @@ -10,7 +10,7 @@ // could be used to create visually identical looking account numbers. // - A string with non-alphanumeric characters is not as easily accepted as an account number. // - E-mail usually won't line-break if there's no punctuation to break at. -// - Doubleclicking selects the whole number as one word if it's all alphanumeric. +// - Double-clicking selects the whole number as one word if it's all alphanumeric. // #ifndef BITCOIN_BASE58_H #define BITCOIN_BASE58_H diff --git a/src/crypter.cpp b/src/crypter.cpp index e821b089bab..8b0f8eb3370 100644 --- a/src/crypter.cpp +++ b/src/crypter.cpp @@ -20,7 +20,7 @@ bool CCrypter::SetKeyFromPassphrase(const std::string& strKeyData, const std::ve if (nRounds < 1 || chSalt.size() != WALLET_CRYPTO_SALT_SIZE) return false; - // Try to keep the keydata out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap) + // Try to keep the key data out of swap (and be a bit over-careful to keep the IV that we don't even use out of swap) // Note that this does nothing about suspend-to-disk (which will put all our key data on disk) // Note as well that at no point in this program is any attempt made to prevent stealing of keys by reading the memory of the running process. mlock(&chKey[0], sizeof chKey); @@ -47,7 +47,7 @@ bool CCrypter::SetKey(const CKeyingMaterial& chNewKey, const std::vector= 1400 - // Disable confusing "helpful" text message on abort, ctrl-c + // Disable confusing "helpful" text message on abort, Ctrl-C _set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT); #endif #ifndef __WXMSW__ diff --git a/src/irc.cpp b/src/irc.cpp index 76157bd034a..cb9c0b7ab83 100644 --- a/src/irc.cpp +++ b/src/irc.cpp @@ -254,7 +254,7 @@ void ThreadIRCSeed(void* parg) void ThreadIRCSeed2(void* parg) { - /* Dont advertise on IRC if we don't allow incoming connections */ + /* Don't advertise on IRC if we don't allow incoming connections */ if (mapArgs.count("-connect") || fNoListen) return; diff --git a/src/main.cpp b/src/main.cpp index 453b0f82579..d5d4605ea17 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -881,7 +881,7 @@ bool CTransaction::DisconnectInputs(CTxDB& txdb) // Remove transaction from index // This can fail if a duplicate of this transaction was in a chain that got // reorganized away. This is only possible if this transaction was completely - // spent, so erasing it would be a no-op anway. + // spent, so erasing it would be a no-op anyway. txdb.EraseTxIndex(*this); return true; @@ -1516,7 +1516,7 @@ bool CBlock::CheckBlock() const if (GetSigOpCount() > MAX_BLOCK_SIGOPS) return error("CheckBlock() : out-of-bounds SigOpCount"); - // Check merkleroot + // Check merkle root if (hashMerkleRoot != BuildMerkleTree()) return error("CheckBlock() : hashMerkleRoot mismatch"); @@ -1704,7 +1704,7 @@ FILE* AppendBlockFile(unsigned int& nFileRet) return NULL; if (fseek(file, 0, SEEK_END) != 0) return NULL; - // FAT32 filesize max 4GB, fseek and ftell max 2GB, so we must stay under 2GB + // FAT32 file size max 4GB, fseek and ftell max 2GB, so we must stay under 2GB if (ftell(file) < 0x7F000000 - MAX_SIZE) { nFileRet = nCurrentBlockFile; @@ -1798,7 +1798,7 @@ bool LoadBlockIndex(bool fAllowNew) void PrintBlockTree() { - // precompute tree structure + // pre-compute tree structure map > mapNext; for (map::iterator mi = mapBlockIndex.begin(); mi != mapBlockIndex.end(); ++mi) { @@ -1851,7 +1851,7 @@ void PrintBlockTree() PrintWallets(block); - // put the main timechain first + // put the main time-chain first vector& vNext = mapNext[pindex]; for (unsigned int i = 0; i < vNext.size(); i++) { @@ -2015,7 +2015,7 @@ bool static AlreadyHave(CTxDB& txdb, const CInv& inv) // The message start string is designed to be unlikely to occur in normal data. -// The characters are rarely used upper ascii, not valid as UTF-8, and produce +// The characters are rarely used upper ASCII, not valid as UTF-8, and produce // a large 4-byte int at any alignment. unsigned char pchMessageStart[4] = { 0xf9, 0xbe, 0xb4, 0xd9 }; @@ -2656,12 +2656,12 @@ bool ProcessMessages(CNode* pfrom) { if (strstr(e.what(), "end of data")) { - // Allow exceptions from underlength message on vRecv + // Allow exceptions from under-length message on vRecv printf("ProcessMessages(%s, %u bytes) : Exception '%s' caught, normally caused by a message being shorter than its stated length\n", strCommand.c_str(), nMessageSize, e.what()); } else if (strstr(e.what(), "size too large")) { - // Allow exceptions from overlong size + // Allow exceptions from over-long size printf("ProcessMessages(%s, %u bytes) : Exception '%s' caught\n", strCommand.c_str(), nMessageSize, e.what()); } else @@ -2921,9 +2921,9 @@ unsigned int static ScanHash_CryptoPP(char* pmidstate, char* pdata, char* phash1 unsigned int& nNonce = *(unsigned int*)(pdata + 12); for (;;) { - // Crypto++ SHA-256 + // Crypto++ SHA256 // Hash pdata using pmidstate as the starting state into - // preformatted buffer phash1, then hash phash1 into phash + // pre-formatted buffer phash1, then hash phash1 into phash nNonce++; SHA256Transform(phash1, pdata, pmidstate); SHA256Transform(phash, phash1, pSHA256InitState); @@ -3148,7 +3148,7 @@ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& void FormatHashBuffers(CBlock* pblock, char* pmidstate, char* pdata, char* phash1) { // - // Prebuild hash buffers + // Pre-build hash buffers // struct { @@ -3270,7 +3270,7 @@ void static BitcoinMiner(CWallet *pwallet) // - // Prebuild hash buffers + // Pre-build hash buffers // char pmidstatebuf[32+16]; char* pmidstate = alignup<16>(pmidstatebuf); char pdatabuf[128+16]; char* pdata = alignup<16>(pdatabuf); @@ -3295,7 +3295,7 @@ void static BitcoinMiner(CWallet *pwallet) unsigned int nHashesDone = 0; unsigned int nNonceFound; - // Crypto++ SHA-256 + // Crypto++ SHA256 nNonceFound = ScanHash_CryptoPP(pmidstate, pdata + 64, phash1, (char*)&hash, nHashesDone); diff --git a/src/net.cpp b/src/net.cpp index 7637f8854c3..d2fa111d233 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -357,7 +357,7 @@ bool GetMyExternalIP(unsigned int& ipRet) { // We should be phasing out our use of sites like these. If we need // replacements, we should ask for volunteers to put this simple - // php file on their webserver that prints the client IP: + // php file on their web server that prints the client IP: // if (nHost == 1) { @@ -680,7 +680,7 @@ CNode* ConnectNode(CAddress addrConnect, int64 nTimeout) /// debug print printf("connected %s\n", addrConnect.ToString().c_str()); - // Set to nonblocking + // Set to non-blocking #ifdef __WXMSW__ u_long nOne = 1; if (ioctlsocket(hSocket, FIONBIO, &nOne) == SOCKET_ERROR) @@ -1704,7 +1704,7 @@ bool BindListenPort(string& strError) #endif #ifdef __WXMSW__ - // Set to nonblocking, incoming connections will also inherit this + // Set to non-blocking, incoming connections will also inherit this if (ioctlsocket(hListenSocket, FIONBIO, (u_long*)&nOne) == SOCKET_ERROR) #else if (fcntl(hListenSocket, F_SETFL, O_NONBLOCK) == SOCKET_ERROR) @@ -1751,7 +1751,7 @@ void StartNode(void* parg) pnodeLocalHost = new CNode(INVALID_SOCKET, CAddress("127.0.0.1", 0, false, nLocalServices)); #ifdef __WXMSW__ - // Get local host ip + // Get local host IP char pszHostName[1000] = ""; if (gethostname(pszHostName, sizeof(pszHostName)) != SOCKET_ERROR) { @@ -1765,7 +1765,7 @@ void StartNode(void* parg) } } #else - // Get local host ip + // Get local host IP struct ifaddrs* myaddrs; if (getifaddrs(&myaddrs) == 0) { diff --git a/src/protocol.cpp b/src/protocol.cpp index 8314e2bb97f..15dd0de92f7 100644 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -215,7 +215,7 @@ bool CAddress::IsRoutable() const bool CAddress::IsValid() const { - // Clean up 3-byte shifted addresses caused by garbage in size field + // Cleanup 3-byte shifted addresses caused by garbage in size field // of addr messages from versions before 0.2.9 checksum. // Two consecutive addr messages look like this: // header20 vectorlen3 addr26 addr26 addr26 header20 vectorlen3 addr26 addr26 addr26... diff --git a/src/rpc.cpp b/src/rpc.cpp index 7f905748749..c77c5055723 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -1580,7 +1580,7 @@ Value getwork(const Array& params, bool fHelp) // Save mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig); - // Prebuild hash buffers + // Pre-build hash buffers char pmidstate[32]; char pdata[128]; char phash1[64]; @@ -1744,7 +1744,7 @@ string rfc1123Time() time(&now); struct tm* now_gmt = gmtime(&now); string locale(setlocale(LC_TIME, NULL)); - setlocale(LC_TIME, "C"); // we want posix (aka "C") weekday/month strings + setlocale(LC_TIME, "C"); // we want POSIX (aka "C") weekday/month strings strftime(buffer, sizeof(buffer), "%a, %d %b %Y %H:%M:%S +0000", now_gmt); setlocale(LC_TIME, locale.c_str()); return string(buffer); @@ -2421,7 +2421,7 @@ int CommandLineRPC(int argc, char *argv[]) int main(int argc, char *argv[]) { #ifdef _MSC_VER - // Turn off microsoft heap dump noise + // Turn off Microsoft heap dump noise _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); _CrtSetReportFile(_CRT_WARN, CreateFile("NUL", GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0)); #endif diff --git a/src/script.cpp b/src/script.cpp index e7664d2cfcf..dd53f903dc6 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -904,7 +904,7 @@ uint256 SignatureHash(CScript scriptCode, const CTransaction& txTo, unsigned int } else if ((nHashType & 0x1f) == SIGHASH_SINGLE) { - // Only lockin the txout payee at same index as txin + // Only lock-in the txout payee at same index as txin unsigned int nOut = nIn; if (nOut >= txTmp.vout.size()) { diff --git a/src/wallet.cpp b/src/wallet.cpp index 8fe77119ee4..38d2b64a176 100644 --- a/src/wallet.cpp +++ b/src/wallet.cpp @@ -628,7 +628,7 @@ void CWallet::ReacceptWalletTransactions() } else { - // Reaccept any txes of ours that aren't already in a block + // Re-accept any txes of ours that aren't already in a block if (!wtx.IsCoinBase()) wtx.AcceptWalletTransaction(txdb, false); } @@ -637,7 +637,7 @@ void CWallet::ReacceptWalletTransactions() { // TODO: optimize this to scan just part of the block chain? if (ScanForWalletTransactions(pindexGenesisBlock)) - fRepeat = true; // Found missing transactions: re-do Reaccept. + fRepeat = true; // Found missing transactions: re-do re-accept. } } }