aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@exmulti.com>2012-09-18 15:07:58 -0400
committerJeff Garzik <jgarzik@redhat.com>2012-09-18 15:07:58 -0400
commitea0796bde3483189643894c6a47d31c0dba0c486 (patch)
tree1cfcad47fd235034085d354fe5021f100d2bda5d /src
parent8b371316c57ddec3f996f7e903de191da281a4ce (diff)
downloadbitcoin-ea0796bde3483189643894c6a47d31c0dba0c486.tar.xz
Trim trailing whitespace for src/*.{h,cpp}
Diffstat (limited to 'src')
-rw-r--r--src/addrman.cpp4
-rw-r--r--src/addrman.h2
-rw-r--r--src/base58.h2
-rw-r--r--src/bitcoinrpc.cpp2
-rw-r--r--src/db.cpp4
-rw-r--r--src/main.h2
-rw-r--r--src/netbase.cpp8
-rw-r--r--src/rpcnet.cpp2
-rw-r--r--src/sync.cpp2
-rw-r--r--src/util.h4
-rw-r--r--src/wallet.h2
11 files changed, 17 insertions, 17 deletions
diff --git a/src/addrman.cpp b/src/addrman.cpp
index 321ebd1e2b..4428cd169a 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -187,7 +187,7 @@ int CAddrMan::ShrinkNew(int nUBucket)
}
assert(mapInfo.count(nOldest) == 1);
CAddrInfo &info = mapInfo[nOldest];
- if (--info.nRefCount == 0)
+ if (--info.nRefCount == 0)
{
SwapRandom(info.nRandomPos, vRandom.size()-1);
vRandom.pop_back();
@@ -241,7 +241,7 @@ void CAddrMan::MakeTried(CAddrInfo& info, int nId, int nOrigin)
infoOld.nRefCount = 1;
// do not update nTried, as we are going to move something else there immediately
- // check whether there is place in that one,
+ // check whether there is place in that one,
if (vNew.size() < ADDRMAN_NEW_BUCKET_SIZE)
{
// if so, move it back there
diff --git a/src/addrman.h b/src/addrman.h
index 7c141c427b..7af6afd78f 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -214,7 +214,7 @@ protected:
// This is the only place where actual deletes occur.
// They are never deleted while in the "tried" table, only possibly evicted back to the "new" table.
int ShrinkNew(int nUBucket);
-
+
// Move an entry from the "new" table(s) to the "tried" table
// @pre vvUnkown[nOrigin].count(nId) != 0
void MakeTried(CAddrInfo& info, int nId, int nOrigin);
diff --git a/src/base58.h b/src/base58.h
index fc8c8aa5de..9dfea86ff5 100644
--- a/src/base58.h
+++ b/src/base58.h
@@ -403,7 +403,7 @@ class CBitcoinSecret : public CBase58Data
{
public:
void SetSecret(const CSecret& vchSecret, bool fCompressed)
- {
+ {
assert(vchSecret.size() == 32);
SetData(fTestNet ? 239 : 128, &vchSecret[0], vchSecret.size());
if (fCompressed)
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index fa39236361..1a3f51ea4d 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -983,7 +983,7 @@ void ThreadRPCServer3(void* parg)
strReply = JSONRPCExecBatch(valRequest.get_array());
else
throw JSONRPCError(-32700, "Top-level object parse error");
-
+
conn->stream() << HTTPReply(200, strReply, fRun) << std::flush;
}
catch (Object& objError)
diff --git a/src/db.cpp b/src/db.cpp
index 015e7ec2de..867703fbd2 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -281,7 +281,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
{ // surround usage of db with extra {}
CDB db(strFile.c_str(), "r");
Db* pdbCopy = new Db(&bitdb.dbenv, 0);
-
+
int ret = pdbCopy->open(NULL, // Txn pointer
strFileRes.c_str(), // Filename
"main", // Logical db name
@@ -293,7 +293,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
printf("Cannot create database file %s\n", strFileRes.c_str());
fSuccess = false;
}
-
+
Dbc* pcursor = db.GetCursor();
if (pcursor)
while (fSuccess)
diff --git a/src/main.h b/src/main.h
index c01aba10e0..2e208fed4f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -753,7 +753,7 @@ public:
return !(a == b);
}
int GetDepthInMainChain() const;
-
+
};
diff --git a/src/netbase.cpp b/src/netbase.cpp
index b66c366641..76a3d25d3a 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -246,7 +246,7 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket)
string strSocks5("\5\1");
strSocks5 += '\000'; strSocks5 += '\003';
strSocks5 += static_cast<char>(std::min((int)strDest.size(), 255));
- strSocks5 += strDest;
+ strSocks5 += strDest;
strSocks5 += static_cast<char>((port >> 8) & 0xFF);
strSocks5 += static_cast<char>((port >> 0) & 0xFF);
ret = send(hSocket, strSocks5.c_str(), strSocks5.size(), MSG_NOSIGNAL);
@@ -478,7 +478,7 @@ bool ConnectSocket(const CService &addrDest, SOCKET& hSocketRet, int nTimeout)
// first connect to proxy server
if (!ConnectSocketDirectly(proxy.first, hSocket, nTimeout))
return false;
-
+
// do socks negotiation
switch (proxy.second) {
case 4:
@@ -617,8 +617,8 @@ bool CNetAddr::IsIPv6() const
bool CNetAddr::IsRFC1918() const
{
return IsIPv4() && (
- GetByte(3) == 10 ||
- (GetByte(3) == 192 && GetByte(2) == 168) ||
+ GetByte(3) == 10 ||
+ (GetByte(3) == 192 && GetByte(2) == 168) ||
(GetByte(3) == 172 && (GetByte(2) >= 16 && GetByte(2) <= 31)));
}
diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp
index f0038dea9f..491297eb1d 100644
--- a/src/rpcnet.cpp
+++ b/src/rpcnet.cpp
@@ -61,7 +61,7 @@ Value getpeerinfo(const Array& params, bool fHelp)
ret.push_back(obj);
}
-
+
return ret;
}
diff --git a/src/sync.cpp b/src/sync.cpp
index 54ad7de4e6..1ac4403beb 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -105,7 +105,7 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
static void pop_lock()
{
- if (fDebug)
+ if (fDebug)
{
const CLockLocation& locklocation = (*lockstack).rbegin()->second;
printf("Unlocked: %s\n", locklocation.ToString().c_str());
diff --git a/src/util.h b/src/util.h
index 65923e68a3..2409ccb79c 100644
--- a/src/util.h
+++ b/src/util.h
@@ -483,7 +483,7 @@ inline uint160 Hash160(const std::vector<unsigned char>& vch)
}
-/** Median filter over a stream of values.
+/** Median filter over a stream of values.
* Returns the median of the last N numbers
*/
template <typename T> class CMedianFilter
@@ -500,7 +500,7 @@ public:
vValues.push_back(initial_value);
vSorted = vValues;
}
-
+
void input(T value)
{
if(vValues.size() == nSize)
diff --git a/src/wallet.h b/src/wallet.h
index 516ad3fa50..22795b75ba 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -353,7 +353,7 @@ static void WriteOrderPos(const int64& nOrderPos, mapValue_t& mapValue)
}
-/** A transaction with a bunch of additional info that only the owner cares about.
+/** A transaction with a bunch of additional info that only the owner cares about.
* It includes any unrecorded transactions needed to link it back to the block chain.
*/
class CWalletTx : public CMerkleTx