Do not shadow upper local variable 'send', prevent -Wshadow compiler warning.
This commit is contained in:
parent
5b2ea29cf4
commit
125b946cb4
1 changed files with 3 additions and 3 deletions
|
@ -4789,16 +4789,16 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
|
||||||
pfrom->PushMessage(NetMsgType::BLOCK, block);
|
pfrom->PushMessage(NetMsgType::BLOCK, block);
|
||||||
else if (inv.type == MSG_FILTERED_BLOCK)
|
else if (inv.type == MSG_FILTERED_BLOCK)
|
||||||
{
|
{
|
||||||
bool send = false;
|
bool sendMerkleBlock = false;
|
||||||
CMerkleBlock merkleBlock;
|
CMerkleBlock merkleBlock;
|
||||||
{
|
{
|
||||||
LOCK(pfrom->cs_filter);
|
LOCK(pfrom->cs_filter);
|
||||||
if (pfrom->pfilter) {
|
if (pfrom->pfilter) {
|
||||||
send = true;
|
sendMerkleBlock = true;
|
||||||
merkleBlock = CMerkleBlock(block, *pfrom->pfilter);
|
merkleBlock = CMerkleBlock(block, *pfrom->pfilter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (send) {
|
if (sendMerkleBlock) {
|
||||||
pfrom->PushMessage(NetMsgType::MERKLEBLOCK, merkleBlock);
|
pfrom->PushMessage(NetMsgType::MERKLEBLOCK, merkleBlock);
|
||||||
// CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see
|
// CMerkleBlock just contains hashes, so also push any transactions in the block the client did not see
|
||||||
// This avoids hurting performance by pointlessly requiring a round-trip
|
// This avoids hurting performance by pointlessly requiring a round-trip
|
||||||
|
|
Loading…
Reference in a new issue