Skip to content

Commit 069f37c

Browse files
author
MarcoFalke
committed
Merge bitcoin#20791: p2p: remove unused legacyWhitelisted in AcceptConnection()
8f9ca31 p2p: remove unused legacyWhitelisted variable (Jon Atack) Pull request description: Noticed while compiling master: ``` net.cpp: In member function ‘void CConnman::AcceptConnection(const CConnman::ListenSocket&)’: net.cpp:1041:10: warning: variable ‘legacyWhitelisted’ set but not used [-Wunused-but-set-variable] 1041 | bool legacyWhitelisted = false; | ^~~~~~~~~~~~~~~~~ ``` ACKs for top commit: glozow: utACK bitcoin@8f9ca31 MarcoFalke: review ACK 8f9ca31 Tree-SHA512: e3fb94d3d34b364b063a115ef9ed06cfd58729a790ba6ed27c7c32430fabf3ca0aa61bc6d33a1236bff802302779c8db28af351208f06c09ad12ce4873c244a6
2 parents d875bcc + 8f9ca31 commit 069f37c

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

src/net.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -1038,14 +1038,12 @@ void CConnman::AcceptConnection(const ListenSocket& hListenSocket) {
10381038
NetPermissionFlags permissionFlags = NetPermissionFlags::PF_NONE;
10391039
hListenSocket.AddSocketPermissionFlags(permissionFlags);
10401040
AddWhitelistPermissionFlags(permissionFlags, addr);
1041-
bool legacyWhitelisted = false;
10421041
if (NetPermissions::HasFlag(permissionFlags, NetPermissionFlags::PF_ISIMPLICIT)) {
10431042
NetPermissions::ClearFlag(permissionFlags, PF_ISIMPLICIT);
10441043
if (gArgs.GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY)) NetPermissions::AddFlag(permissionFlags, PF_FORCERELAY);
10451044
if (gArgs.GetBoolArg("-whitelistrelay", DEFAULT_WHITELISTRELAY)) NetPermissions::AddFlag(permissionFlags, PF_RELAY);
10461045
NetPermissions::AddFlag(permissionFlags, PF_MEMPOOL);
10471046
NetPermissions::AddFlag(permissionFlags, PF_NOBAN);
1048-
legacyWhitelisted = true;
10491047
}
10501048

10511049
{

0 commit comments

Comments
 (0)