maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2503 from chromatic/fix-tinyformat-switch-fallthrough-warnings

Browse source 
Fix implicit switch fallthrough warnings
This commit is contained in:
Patrick Lodder 2021-09-04 20:07:34 +02:00 committed by GitHub
parent 1b9bc8fada 7a0b3034c7
commit 88e79c9cc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/hash.cpp
View file

@ -49,8 +49,10 @@ unsigned int MurmurHash3(unsigned int nHashSeed, const std::vector<unsigned char
switch (vDataToHash.size() & 3) {
case 3:
k1 ^= tail[2] << 16;
// Falls through
case 2:
k1 ^= tail[1] << 8;
// Falls through
case 1:
k1 ^= tail[0];
k1 *= c1;

3
src/qt/rpcconsole.cpp
View file

@ -268,7 +268,9 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
}
if (breakParsing)
break;
}
// Falls through
case STATE_ARGUMENT: // In or after argument
case STATE_EATING_SPACES_IN_ARG:
case STATE_EATING_SPACES_IN_BRACKETS:
@ -374,6 +376,7 @@ bool RPCConsole::RPCParseCommandLine(std::string &strResult, const std::string &
strResult = lastResult.get_str();
else
strResult = lastResult.write(2);
// Falls through
case STATE_ARGUMENT:
case STATE_EATING_SPACES:
return true;

1
src/rest.cpp
View file

@ -461,6 +461,7 @@ static bool rest_getutxos(HTTPRequest* req, const std::string& strURIPart)
std::vector<unsigned char> strRequestV = ParseHex(strRequestMutable);
strRequestMutable.assign(strRequestV.begin(), strRequestV.end());
}
// Falls through
case RF_BINARY: {
try {

6
src/rpc/mining.cpp
View file

@ -666,9 +666,11 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
// Not exposed to GBT at all
break;
case THRESHOLD_LOCKED_IN:
// Ensure bit is set in block version
{
// Ensure bit is set in block version, then fall through to get vbavailable set
pblock->nVersion |= VersionBitsMask(consensusParams, pos);
// FALL THROUGH to get vbavailable set...
}
// Falls through
case THRESHOLD_STARTED:
{
const struct BIP9DeploymentInfo& vbinfo = VersionBitsDeploymentInfo[pos];

4
src/tinyformat.h
View file

@ -705,23 +705,27 @@ inline const char* streamStateFromFormat(std::ostream& out, bool& spacePadPositi
break;
case 'X':
out.setf(std::ios::uppercase);
// Falls through
case 'x': case 'p':
out.setf(std::ios::hex, std::ios::basefield);
intConversion = true;
break;
case 'E':
out.setf(std::ios::uppercase);
// Falls through
case 'e':
out.setf(std::ios::scientific, std::ios::floatfield);
out.setf(std::ios::dec, std::ios::basefield);
break;
case 'F':
out.setf(std::ios::uppercase);
// Falls through
case 'f':
out.setf(std::ios::fixed, std::ios::floatfield);
break;
case 'G':
out.setf(std::ios::uppercase);
// Falls through
case 'g':
out.setf(std::ios::dec, std::ios::basefield);
// As in boost::format, let stream decide float format.