Skip to content

Commit 3fce72e

Browse files
laanwjlaanwj
committed
Merge pull request #6206
a9ac95c use const references where appropriate (Philip Kaufmann)
2 parents d38cd47 + a9ac95c commit 3fce72e

21 files changed

+61
-63
lines changed

‎src/alert.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ std::string CUnsignedAlert::ToString() const
5050
BOOST_FOREACH(int n, setCancel)
5151
strSetCancel += strprintf("%d ", n);
5252
std::string strSetSubVer;
53-
BOOST_FOREACH(std::string str, setSubVer)
53+
BOOST_FOREACH(const std::string& str, setSubVer)
5454
strSetSubVer += "\"" + str + "\" ";
5555
return strprintf(
5656
"CAlert(\n"
@@ -110,7 +110,7 @@ bool CAlert::Cancels(const CAlert& alert) const
110110
return (alert.nID <= nCancel || setCancel.count(alert.nID));
111111
}
112112

113-
bool CAlert::AppliesTo(int nVersion, std::string strSubVerIn) const
113+
bool CAlert::AppliesTo(int nVersion, const std::string& strSubVerIn) const
114114
{
115115
// TODO: rework for client-version-embedded-in-strSubVer ?
116116
return (IsInEffect() &&

‎src/alert.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class CAlert : public CUnsignedAlert
9797
uint256 GetHash() const;
9898
bool IsInEffect() const;
9999
bool Cancels(const CAlert& alert) const;
100-
bool AppliesTo(int nVersion, std::string strSubVerIn) const;
100+
bool AppliesTo(int nVersion, const std::string& strSubVerIn) const;
101101
bool AppliesToMe() const;
102102
bool RelayTo(CNode* pnode) const;
103103
bool CheckSignature(const std::vector<unsigned char>& alertKey) const;

‎src/consensus/validation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class CValidationState {
4848
unsigned char _chRejectCode=0, std::string _strRejectReason="") {
4949
return DoS(0, ret, _chRejectCode, _strRejectReason);
5050
}
51-
bool Error(std::string strRejectReasonIn="") {
51+
bool Error(const std::string& strRejectReasonIn) {
5252
if (mode == MODE_VALID)
5353
strRejectReason = strRejectReasonIn;
5454
mode = MODE_ERROR;

‎src/core_io.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class uint256;
1515
class UniValue;
1616

1717
// core_read.cpp
18-
extern CScript ParseScript(std::string s);
18+
extern CScript ParseScript(const std::string& s);
1919
extern bool DecodeHexTx(CTransaction& tx, const std::string& strHexTx);
2020
extern bool DecodeHexBlk(CBlock&, const std::string& strHexBlk);
2121
extern uint256 ParseHashUV(const UniValue& v, const std::string& strName);

‎src/core_read.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
using namespace std;
2424

25-
CScript ParseScript(std::string s)
25+
CScript ParseScript(const std::string& s)
2626
{
2727
CScript result;
2828

‎src/init.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
535535
}
536536

537537
// -loadblock=
538-
BOOST_FOREACH(boost::filesystem::path &path, vImportFiles) {
538+
BOOST_FOREACH(const boost::filesystem::path& path, vImportFiles) {
539539
FILE *file = fopen(path.string().c_str(), "rb");
540540
if (file) {
541541
CImportingNow imp;
@@ -929,15 +929,15 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
929929

930930
std::string warningString;
931931
std::string errorString;
932-
932+
933933
if (!CWallet::Verify(strWalletFile, warningString, errorString))
934934
return false;
935-
935+
936936
if (!warningString.empty())
937937
InitWarning(warningString);
938938
if (!errorString.empty())
939939
return InitError(warningString);
940-
940+
941941
} // (!fDisableWallet)
942942
#endif // ENABLE_WALLET
943943
// ********************************************************* Step 6: network initialization
@@ -946,7 +946,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
946946

947947
if (mapArgs.count("-onlynet")) {
948948
std::set<enum Network> nets;
949-
BOOST_FOREACH(std::string snet, mapMultiArgs["-onlynet"]) {
949+
BOOST_FOREACH(const std::string& snet, mapMultiArgs["-onlynet"]) {
950950
enum Network net = ParseNetwork(snet);
951951
if (net == NET_UNROUTABLE)
952952
return InitError(strprintf(_("Unknown network specified in -onlynet: '%s'"), snet));
@@ -1003,13 +1003,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
10031003
bool fBound = false;
10041004
if (fListen) {
10051005
if (mapArgs.count("-bind") || mapArgs.count("-whitebind")) {
1006-
BOOST_FOREACH(std::string strBind, mapMultiArgs["-bind"]) {
1006+
BOOST_FOREACH(const std::string& strBind, mapMultiArgs["-bind"]) {
10071007
CService addrBind;
10081008
if (!Lookup(strBind.c_str(), addrBind, GetListenPort(), false))
10091009
return InitError(strprintf(_("Cannot resolve -bind address: '%s'"), strBind));
10101010
fBound |= Bind(addrBind, (BF_EXPLICIT | BF_REPORT_ERROR));
10111011
}
1012-
BOOST_FOREACH(std::string strBind, mapMultiArgs["-whitebind"]) {
1012+
BOOST_FOREACH(const std::string& strBind, mapMultiArgs["-whitebind"]) {
10131013
CService addrBind;
10141014
if (!Lookup(strBind.c_str(), addrBind, 0, false))
10151015
return InitError(strprintf(_("Cannot resolve -whitebind address: '%s'"), strBind));
@@ -1029,15 +1029,15 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
10291029
}
10301030

10311031
if (mapArgs.count("-externalip")) {
1032-
BOOST_FOREACH(string strAddr, mapMultiArgs["-externalip"]) {
1032+
BOOST_FOREACH(const std::string& strAddr, mapMultiArgs["-externalip"]) {
10331033
CService addrLocal(strAddr, GetListenPort(), fNameLookup);
10341034
if (!addrLocal.IsValid())
10351035
return InitError(strprintf(_("Cannot resolve -externalip address: '%s'"), strAddr));
10361036
AddLocal(CService(strAddr, GetListenPort(), fNameLookup), LOCAL_MANUAL);
10371037
}
10381038
}
10391039

1040-
BOOST_FOREACH(string strDest, mapMultiArgs["-seednode"])
1040+
BOOST_FOREACH(const std::string& strDest, mapMultiArgs["-seednode"])
10411041
AddOneShot(strDest);
10421042

10431043
// ********************************************************* Step 7: load block chain
@@ -1362,7 +1362,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
13621362
std::vector<boost::filesystem::path> vImportFiles;
13631363
if (mapArgs.count("-loadblock"))
13641364
{
1365-
BOOST_FOREACH(string strFile, mapMultiArgs["-loadblock"])
1365+
BOOST_FOREACH(const std::string& strFile, mapMultiArgs["-loadblock"])
13661366
vImportFiles.push_back(strFile);
13671367
}
13681368
threadGroup.create_thread(boost::bind(&ThreadImport, vImportFiles));

‎src/main.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ bool CheckFinalTx(const CTransaction &tx)
693693
/**
694694
* Check transaction inputs to mitigate two
695695
* potential denial-of-service attacks:
696-
*
696+
*
697697
* 1. scriptSigs with extra data stuffed into them,
698698
* not consumed by scriptPubKey (or P2SH script)
699699
* 2. P2SH scripts with a crazy number of expensive
@@ -2148,7 +2148,7 @@ static int64_t nTimeFlush = 0;
21482148
static int64_t nTimeChainState = 0;
21492149
static int64_t nTimePostConnect = 0;
21502150

2151-
/**
2151+
/**
21522152
* Connect a new block to chainActive. pblock is either NULL or a pointer to a CBlock
21532153
* corresponding to pindexNew, to bypass loading it again from disk.
21542154
*/
@@ -3696,7 +3696,7 @@ void static CheckBlockIndex()
36963696
// CAlert
36973697
//
36983698

3699-
string GetWarnings(string strFor)
3699+
std::string GetWarnings(const std::string& strFor)
37003700
{
37013701
int nPriority = 0;
37023702
string strStatusBar;

‎src/main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ void PartitionCheck(bool (*initialDownloadCheck)(), CCriticalSection& cs, const
190190
/** Check whether we are doing an initial block download (synchronizing from disk or network) */
191191
bool IsInitialBlockDownload();
192192
/** Format a string that describes several potential problems detected by the core */
193-
std::string GetWarnings(std::string strFor);
193+
std::string GetWarnings(const std::string& strFor);
194194
/** Retrieve a transaction (from memory pool, or from disk, if possible) */
195195
bool GetTransaction(const uint256 &hash, CTransaction &tx, uint256 &hashBlock, bool fAllowSlow = false);
196196
/** Find the best known block, and make it the tip of the block chain */

‎src/net.cpp

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ boost::condition_variable messageHandlerCondition;
107107
static CNodeSignals g_signals;
108108
CNodeSignals& GetNodeSignals() { return g_signals; }
109109

110-
void AddOneShot(string strDest)
110+
void AddOneShot(const std::string& strDest)
111111
{
112112
LOCK(cs_vOneShots);
113113
vOneShots.push_back(strDest);
@@ -1124,7 +1124,7 @@ void ThreadDNSAddressSeed()
11241124
vector<CAddress> vAdd;
11251125
if (LookupHost(seed.host.c_str(), vIPs))
11261126
{
1127-
BOOST_FOREACH(CNetAddr& ip, vIPs)
1127+
BOOST_FOREACH(const CNetAddr& ip, vIPs)
11281128
{
11291129
int nOneDay = 24*3600;
11301130
CAddress addr = CAddress(CService(ip, Params().GetDefaultPort()));
@@ -1188,7 +1188,7 @@ void ThreadOpenConnections()
11881188
for (int64_t nLoop = 0;; nLoop++)
11891189
{
11901190
ProcessOneShot();
1191-
BOOST_FOREACH(string strAddr, mapMultiArgs["-connect"])
1191+
BOOST_FOREACH(const std::string& strAddr, mapMultiArgs["-connect"])
11921192
{
11931193
CAddress addr;
11941194
OpenNetworkConnection(addr, NULL, strAddr.c_str());
@@ -1291,10 +1291,10 @@ void ThreadOpenAddedConnections()
12911291
list<string> lAddresses(0);
12921292
{
12931293
LOCK(cs_vAddedNodes);
1294-
BOOST_FOREACH(string& strAddNode, vAddedNodes)
1294+
BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
12951295
lAddresses.push_back(strAddNode);
12961296
}
1297-
BOOST_FOREACH(string& strAddNode, lAddresses) {
1297+
BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
12981298
CAddress addr;
12991299
CSemaphoreGrant grant(*semOutbound);
13001300
OpenNetworkConnection(addr, &grant, strAddNode.c_str());
@@ -1309,20 +1309,19 @@ void ThreadOpenAddedConnections()
13091309
list<string> lAddresses(0);
13101310
{
13111311
LOCK(cs_vAddedNodes);
1312-
BOOST_FOREACH(string& strAddNode, vAddedNodes)
1312+
BOOST_FOREACH(const std::string& strAddNode, vAddedNodes)
13131313
lAddresses.push_back(strAddNode);
13141314
}
13151315

13161316
list<vector<CService> > lservAddressesToAdd(0);
1317-
BOOST_FOREACH(string& strAddNode, lAddresses)
1318-
{
1317+
BOOST_FOREACH(const std::string& strAddNode, lAddresses) {
13191318
vector<CService> vservNode(0);
13201319
if(Lookup(strAddNode.c_str(), vservNode, Params().GetDefaultPort(), fNameLookup, 0))
13211320
{
13221321
lservAddressesToAdd.push_back(vservNode);
13231322
{
13241323
LOCK(cs_setservAddNodeAddresses);
1325-
BOOST_FOREACH(CService& serv, vservNode)
1324+
BOOST_FOREACH(const CService& serv, vservNode)
13261325
setservAddNodeAddresses.insert(serv);
13271326
}
13281327
}
@@ -1333,7 +1332,7 @@ void ThreadOpenAddedConnections()
13331332
LOCK(cs_vNodes);
13341333
BOOST_FOREACH(CNode* pnode, vNodes)
13351334
for (list<vector<CService> >::iterator it = lservAddressesToAdd.begin(); it != lservAddressesToAdd.end(); it++)
1336-
BOOST_FOREACH(CService& addrNode, *(it))
1335+
BOOST_FOREACH(const CService& addrNode, *(it))
13371336
if (pnode->addr == addrNode)
13381337
{
13391338
it = lservAddressesToAdd.erase(it);
@@ -1906,7 +1905,7 @@ bool CAddrDB::Read(CAddrMan& addr)
19061905
unsigned int ReceiveFloodSize() { return 1000*GetArg("-maxreceivebuffer", 5*1000); }
19071906
unsigned int SendBufferSize() { return 1000*GetArg("-maxsendbuffer", 1*1000); }
19081907

1909-
CNode::CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn, bool fInboundIn) :
1908+
CNode::CNode(SOCKET hSocketIn, const CAddress& addrIn, const std::string& addrNameIn, bool fInboundIn) :
19101909
ssSend(SER_NETWORK, INIT_PROTO_VERSION),
19111910
addrKnown(5000, 0.001, insecure_rand()),
19121911
setInventoryKnown(SendBufferSize() / 1000)

‎src/net.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static const size_t MAPASKFOR_MAX_SZ = MAX_INV_SZ;
6363
unsigned int ReceiveFloodSize();
6464
unsigned int SendBufferSize();
6565

66-
void AddOneShot(std::string strDest);
66+
void AddOneShot(const std::string& strDest);
6767
void AddressCurrentlyConnected(const CService& addr);
6868
CNode* FindNode(const CNetAddr& ip);
6969
CNode* FindNode(const std::string& addrName);
@@ -321,7 +321,7 @@ class CNode
321321
// Whether a ping is requested.
322322
bool fPingQueued;
323323

324-
CNode(SOCKET hSocketIn, CAddress addrIn, std::string addrNameIn = "", bool fInboundIn=false);
324+
CNode(SOCKET hSocketIn, const CAddress &addrIn, const std::string &addrNameIn = "", bool fInboundIn = false);
325325
~CNode();
326326

327327
private:

0 commit comments

Comments
 (0)