Skip to content

Commit a140953

Browse files
author
MarcoFalke
committed
Merge #13753: scripted-diff: Remove trailing whitespaces
12dd101 scripted-diff: Remove trailing whitespaces (João Barbosa) Pull request description: The script test/lint/lint-whitespace.sh should prevent new cases. This happens in some pulls where the code editor and the author 'git add's them, so this would fix it all. Tree-SHA512: bcdd3472fcd01a2754e52212c7db1de2fdc422728b06785481954a27162fb72001cb73708329cc56e95bcc5e45c1348ebc4eacc2ccfa6aa12413c7ec450b6a33
2 parents c883653 + 12dd101 commit a140953

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+152
-152
lines changed

src/Makefile.qt.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ if ENABLE_WALLET
357357
BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
358358
endif
359359

360-
RES_IMAGES =
360+
RES_IMAGES =
361361

362362
RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)
363363

src/addrman.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ CAddrInfo CAddrMan::Select_(bool newOnly)
356356

357357
// Use a 50% chance for choosing between tried and new table entries.
358358
if (!newOnly &&
359-
(nTried > 0 && (nNew == 0 || RandomInt(2) == 0))) {
359+
(nTried > 0 && (nNew == 0 || RandomInt(2) == 0))) {
360360
// use a tried node
361361
double fChanceFactor = 1.0;
362362
while (1) {

src/addrman.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ class CAddrInfo : public CAddress
182182
//! the maximum number of tried addr collisions to store
183183
#define ADDRMAN_SET_TRIED_COLLISION_SIZE 10
184184

185-
/**
186-
* Stochastical (IP) address manager
185+
/**
186+
* Stochastical (IP) address manager
187187
*/
188188
class CAddrMan
189189
{

src/bloom.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ bool CBloomFilter::IsRelevantAndUpdate(const CTransaction& tx)
148148
const CTxOut& txout = tx.vout[i];
149149
// Match if the filter contains any arbitrary script data element in any scriptPubKey in tx
150150
// If this matches, also add the specific output that was matched.
151-
// This means clients don't have to update the filter themselves when a new relevant tx
151+
// This means clients don't have to update the filter themselves when a new relevant tx
152152
// is discovered in order to find spending transactions, which avoids round-tripping and race conditions.
153153
CScript::const_iterator pc = txout.scriptPubKey.begin();
154154
std::vector<unsigned char> data;

src/bloom.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ enum bloomflags
3333
/**
3434
* BloomFilter is a probabilistic filter which SPV clients provide
3535
* so that we can filter the transactions we send them.
36-
*
36+
*
3737
* This allows for significantly more efficient transaction and block downloads.
38-
*
38+
*
3939
* Because bloom filters are probabilistic, a SPV node can increase the false-
4040
* positive rate, making us send it transactions which aren't actually its,
4141
* allowing clients to trade more bandwidth for more privacy by obfuscating which

src/checkqueue.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
template <typename T>
1717
class CCheckQueueControl;
1818

19-
/**
19+
/**
2020
* Queue for verifications that have to be performed.
2121
* The verifications are represented by a type T, which must provide an
2222
* operator(), returning a bool.
@@ -163,7 +163,7 @@ class CCheckQueue
163163

164164
};
165165

166-
/**
166+
/**
167167
* RAII-style controller object for a CCheckQueue that guarantees the passed
168168
* queue is finished before continuing.
169169
*/

src/clientversion.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ std::string FormatFullVersion()
8181
return CLIENT_BUILD;
8282
}
8383

84-
/**
85-
* Format the subversion field according to BIP 14 spec (https://github.com/bitcoin/bips/blob/master/bip-0014.mediawiki)
84+
/**
85+
* Format the subversion field according to BIP 14 spec (https://github.com/bitcoin/bips/blob/master/bip-0014.mediawiki)
8686
*/
8787
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments)
8888
{

src/coins.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class CCoinsViewCache : public CCoinsViewBacked
203203
protected:
204204
/**
205205
* Make mutable so that we can "fill the cache" even from Get-methods
206-
* declared as "const".
206+
* declared as "const".
207207
*/
208208
mutable uint256 hashBlock;
209209
mutable CCoinsMap cacheCoins;
@@ -280,7 +280,7 @@ class CCoinsViewCache : public CCoinsViewBacked
280280
//! Calculate the size of the cache (in bytes)
281281
size_t DynamicMemoryUsage() const;
282282

283-
/**
283+
/**
284284
* Amount of bitcoins coming in to a transaction
285285
* Note that lightweight clients may not know anything besides the hash of previous transactions,
286286
* so may not be able to calculate this.

src/consensus/tx_verify.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ unsigned int GetLegacySigOpCount(const CTransaction& tx);
4141

4242
/**
4343
* Count ECDSA signature operations in pay-to-script-hash inputs.
44-
*
44+
*
4545
* @param[in] mapInputs Map of previous transactions that have outputs we're spending
4646
* @return maximum number of sigops required to validate this transaction's inputs
4747
* @see CTransaction::FetchInputs

src/core_read.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ static bool CheckTxScriptsSanity(const CMutableTransaction& tx)
106106
return false;
107107
}
108108
}
109-
109+
110110
return true;
111111
}
112112

@@ -141,7 +141,7 @@ bool DecodeHexTx(CMutableTransaction& tx, const std::string& hex_tx, bool try_no
141141
// Fall through.
142142
}
143143
}
144-
144+
145145
return false;
146146
}
147147

0 commit comments

Comments
 (0)