aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/addrman.cpp8
-rw-r--r--src/bench/bench.cpp3
-rw-r--r--src/bitcoin-tx.cpp12
-rw-r--r--src/checkqueue.h7
-rw-r--r--src/httprpc.cpp10
-rw-r--r--src/init.cpp8
-rw-r--r--src/rest.cpp4
-rw-r--r--src/rpc/client.cpp2
-rw-r--r--src/rpc/net.cpp2
9 files changed, 31 insertions, 25 deletions
diff --git a/src/addrman.cpp b/src/addrman.cpp
index 5a769ac93..9eefffb45 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -387,7 +387,7 @@ int CAddrMan::Check_()
std::set<int> setTried;
std::map<int, int> mapNew;
- if (vRandom.size() != nTried + nNew)
+ if (vRandom.size() != (size_t)(nTried + nNew))
return -7;
for (const auto& entry : mapInfo) {
@@ -408,7 +408,7 @@ int CAddrMan::Check_()
}
if (mapAddr[info] != n)
return -5;
- if (info.nRandomPos < 0 || info.nRandomPos >= vRandom.size() || vRandom[info.nRandomPos] != n)
+ if (info.nRandomPos < 0 || (size_t)info.nRandomPos >= vRandom.size() || vRandom[info.nRandomPos] != n)
return -14;
if (info.nLastTry < 0)
return -6;
@@ -416,9 +416,9 @@ int CAddrMan::Check_()
return -8;
}
- if (setTried.size() != nTried)
+ if (setTried.size() != (size_t)nTried)
return -9;
- if (mapNew.size() != nNew)
+ if (mapNew.size() != (size_t)nNew)
return -10;
for (int n = 0; n < ADDRMAN_TRIED_BUCKET_COUNT; n++) {
diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index dd120f359..21329a515 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -100,6 +100,9 @@ void benchmark::BenchRunner::RunAll(Printer& printer, uint64_t num_evals, double
if (!std::ratio_less_equal<benchmark::clock::period, std::micro>::value) {
std::cerr << "WARNING: Clock precision is worse than microsecond - benchmarks may be less accurate!\n";
}
+#ifdef DEBUG
+ std::cerr << "WARNING: This is a debug build - may result in slower benchmarks.\n";
+#endif
std::regex reFilter(filter);
std::smatch baseMatch;
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 9bcf3fe8d..f1cf7c9d2 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -305,8 +305,8 @@ static void MutateTxAddOutPubKey(CMutableTransaction& tx, const std::string& str
bool bScriptHash = false;
if (vStrInputParts.size() == 3) {
std::string flags = vStrInputParts[2];
- bSegWit = (flags.find("W") != std::string::npos);
- bScriptHash = (flags.find("S") != std::string::npos);
+ bSegWit = (flags.find('W') != std::string::npos);
+ bScriptHash = (flags.find('S') != std::string::npos);
}
if (bSegWit) {
@@ -367,8 +367,8 @@ static void MutateTxAddOutMultiSig(CMutableTransaction& tx, const std::string& s
bool bScriptHash = false;
if (vStrInputParts.size() == numkeys + 4) {
std::string flags = vStrInputParts.back();
- bSegWit = (flags.find("W") != std::string::npos);
- bScriptHash = (flags.find("S") != std::string::npos);
+ bSegWit = (flags.find('W') != std::string::npos);
+ bScriptHash = (flags.find('S') != std::string::npos);
}
else if (vStrInputParts.size() > numkeys + 4) {
// Validate that there were no more parameters passed
@@ -447,8 +447,8 @@ static void MutateTxAddOutScript(CMutableTransaction& tx, const std::string& str
bool bScriptHash = false;
if (vStrInputParts.size() == 3) {
std::string flags = vStrInputParts.back();
- bSegWit = (flags.find("W") != std::string::npos);
- bScriptHash = (flags.find("S") != std::string::npos);
+ bSegWit = (flags.find('W') != std::string::npos);
+ bScriptHash = (flags.find('S') != std::string::npos);
}
if (scriptPubKey.size() > MAX_SCRIPT_SIZE) {
diff --git a/src/checkqueue.h b/src/checkqueue.h
index 9b4a460ba..7500bae60 100644
--- a/src/checkqueue.h
+++ b/src/checkqueue.h
@@ -59,9 +59,6 @@ private:
*/
unsigned int nTodo;
- //! Whether we're shutting down.
- bool fQuit;
-
//! The maximum number of elements to be processed in one batch
unsigned int nBatchSize;
@@ -89,7 +86,7 @@ private:
}
// logically, the do loop starts here
while (queue.empty()) {
- if ((fMaster || fQuit) && nTodo == 0) {
+ if (fMaster && nTodo == 0) {
nTotal--;
bool fRet = fAllOk;
// reset the status for new work later
@@ -131,7 +128,7 @@ public:
boost::mutex ControlMutex;
//! Create a new check queue
- explicit CCheckQueue(unsigned int nBatchSizeIn) : nIdle(0), nTotal(0), fAllOk(true), nTodo(0), fQuit(false), nBatchSize(nBatchSizeIn) {}
+ explicit CCheckQueue(unsigned int nBatchSizeIn) : nIdle(0), nTotal(0), fAllOk(true), nTodo(0), nBatchSize(nBatchSizeIn) {}
//! Worker thread
void Thread()
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index 66f7a6a71..5e9e41974 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -85,11 +85,11 @@ static void JSONErrorReply(HTTPRequest* req, const UniValue& objError, const Uni
//entries from config file.
static bool multiUserAuthorized(std::string strUserPass)
{
- if (strUserPass.find(":") == std::string::npos) {
+ if (strUserPass.find(':') == std::string::npos) {
return false;
}
- std::string strUser = strUserPass.substr(0, strUserPass.find(":"));
- std::string strPass = strUserPass.substr(strUserPass.find(":") + 1);
+ std::string strUser = strUserPass.substr(0, strUserPass.find(':'));
+ std::string strPass = strUserPass.substr(strUserPass.find(':') + 1);
for (const std::string& strRPCAuth : gArgs.GetArgs("-rpcauth")) {
//Search for multi-user login/pass "rpcauth" from config
@@ -132,8 +132,8 @@ static bool RPCAuthorized(const std::string& strAuth, std::string& strAuthUserna
boost::trim(strUserPass64);
std::string strUserPass = DecodeBase64(strUserPass64);
- if (strUserPass.find(":") != std::string::npos)
- strAuthUsernameOut = strUserPass.substr(0, strUserPass.find(":"));
+ if (strUserPass.find(':') != std::string::npos)
+ strAuthUsernameOut = strUserPass.substr(0, strUserPass.find(':'));
//Check if authorized under single-user field
if (TimingResistantEqual(strUserPass, strRPCUserColonPass)) {
diff --git a/src/init.cpp b/src/init.cpp
index d1d733af9..94702301a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -808,7 +808,13 @@ void InitLogging()
fLogIPs = gArgs.GetBoolArg("-logips", DEFAULT_LOGIPS);
LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
- LogPrintf("Bitcoin version %s\n", FormatFullVersion());
+ std::string version_string = FormatFullVersion();
+#ifdef DEBUG
+ version_string += " (debug build)";
+#else
+ version_string += " (release build)";
+#endif
+ LogPrintf(PACKAGE_NAME " version %s\n", version_string);
}
namespace { // Variables internal to initialization process only
diff --git a/src/rest.cpp b/src/rest.cpp
index 0c93ce020..30e481171 100644
--- a/src/rest.cpp
+++ b/src/rest.cpp
@@ -423,8 +423,8 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
{
uint256 txid;
int32_t nOutput;
- std::string strTxid = uriParts[i].substr(0, uriParts[i].find("-"));
- std::string strOutput = uriParts[i].substr(uriParts[i].find("-")+1);
+ std::string strTxid = uriParts[i].substr(0, uriParts[i].find('-'));
+ std::string strOutput = uriParts[i].substr(uriParts[i].find('-')+1);
if (!ParseInt32(strOutput, &nOutput) || !IsHex(strTxid))
return RESTERR(req, HTTP_BAD_REQUEST, "Parse error");
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index f63e970bd..b88c1bccd 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -213,7 +213,7 @@ UniValue RPCConvertNamedValues(const std::string &strMethod, const std::vector<s
UniValue params(UniValue::VOBJ);
for (const std::string &s: strParams) {
- size_t pos = s.find("=");
+ size_t pos = s.find('=');
if (pos == std::string::npos) {
throw(std::runtime_error("No '=' in named argument '"+s+"', this needs to be present for every argument (even if it is empty)"));
}
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp
index a81b65198..59b376c59 100644
--- a/src/rpc/net.cpp
+++ b/src/rpc/net.cpp
@@ -516,7 +516,7 @@ UniValue setban(const JSONRPCRequest& request)
CNetAddr netAddr;
bool isSubnet = false;
- if (request.params[0].get_str().find("/") != std::string::npos)
+ if (request.params[0].get_str().find('/') != std::string::npos)
isSubnet = true;
if (!isSubnet) {
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-29 11:57:15 +0000