Browse Source

Merge pull request #1532 from fanquake/master

Fix a couple typos
0.8
Jeff Garzik 13 years ago
parent
commit
a590aae017
  1. 4
      src/addrman.h
  2. 6
      src/base58.h
  3. 2
      src/sync.cpp
  4. 2
      src/util.cpp
  5. 2
      src/wallet.h

4
src/addrman.h

@ -23,13 +23,13 @@ private: @@ -23,13 +23,13 @@ private:
// where knowledge about this address first came from
CNetAddr source;
// last succesfull connection by us
// last successful connection by us
int64 nLastSuccess;
// last try whatsoever by us:
// int64 CAddress::nLastTry
// connection attempts since last succesful attempt
// connection attempts since last successful attempt
int nAttempts;
// reference count in new sets (memory only)

6
src/base58.h

@ -119,7 +119,7 @@ inline bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet) @@ -119,7 +119,7 @@ inline bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet)
}
// Decode a base58-encoded string str into byte vector vchRet
// returns true if decoding is succesful
// returns true if decoding is successful
inline bool DecodeBase58(const std::string& str, std::vector<unsigned char>& vchRet)
{
return DecodeBase58(str.c_str(), vchRet);
@ -139,7 +139,7 @@ inline std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn) @@ -139,7 +139,7 @@ inline std::string EncodeBase58Check(const std::vector<unsigned char>& vchIn)
}
// Decode a base58-encoded string psz that includes a checksum, into byte vector vchRet
// returns true if decoding is succesful
// returns true if decoding is successful
inline bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRet)
{
if (!DecodeBase58(psz, vchRet))
@ -160,7 +160,7 @@ inline bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRe @@ -160,7 +160,7 @@ inline bool DecodeBase58Check(const char* psz, std::vector<unsigned char>& vchRe
}
// Decode a base58-encoded string str that includes a checksum, into byte vector vchRet
// returns true if decoding is succesful
// returns true if decoding is successful
inline bool DecodeBase58Check(const std::string& str, std::vector<unsigned char>& vchRet)
{
return DecodeBase58Check(str.c_str(), vchRet);

2
src/sync.cpp

@ -24,7 +24,7 @@ void PrintLockContention(const char* pszName, const char* pszFile, int nLine) @@ -24,7 +24,7 @@ void PrintLockContention(const char* pszName, const char* pszFile, int nLine)
// --> may result in deadlock between the two threads, depending on when they run.
// Solution implemented here:
// Keep track of pairs of locks: (A before B), (A before C), etc.
// Complain if any thread trys to lock in a different order.
// Complain if any thread tries to lock in a different order.
//
struct CLockLocation

2
src/util.cpp

@ -1142,7 +1142,7 @@ void ShrinkDebugFile() @@ -1142,7 +1142,7 @@ void ShrinkDebugFile()
// "Never go to sea with two chronometers; take one or three."
// Our three time sources are:
// - System clock
// - Median of other nodes's clocks
// - Median of other nodes clocks
// - The user (asking the user to fix the system clock if the first two disagree)
//
static int64 nMockTime = 0; // For unit testing

2
src/wallet.h

@ -69,7 +69,7 @@ private: @@ -69,7 +69,7 @@ private:
// the current wallet version: clients below this version are not able to load the wallet
int nWalletVersion;
// the maxmimum wallet format version: memory-only variable that specifies to what version this wallet may be upgraded
// the maximum wallet format version: memory-only variable that specifies to what version this wallet may be upgraded
int nWalletMaxVersion;
public:

Loading…
Cancel
Save