Merge bitcoin/bitcoin#25814: net: simplify GetLocalAddress()

MacroFake · MacroFake · commit 89b219412495 · 2022-08-12T10:52:42.000+02:00
daabd41 net: simplify GetLocalAddress() (Vasil Dimov) Pull request description: There is no need to use two variables `ret` and `addr` of the same type `CService` and assign one to the other in a strange way like `ret = CService{addr}`. ACKs for top commit: jarolrod: ACK daabd41 aureleoules: ACK daabd41. w0xlt: ACK bitcoin/bitcoin@daabd41 Tree-SHA512: 4bbd3746bc30fbc05bb32b58bb122c938acd849c0f72f1d3e8170557c1999ec26a888e06e874c3fc22562a2becddc7d817db7d174e0e1b383e8d74c39aa1e898
diff --git a/src/net.cpp b/src/net.cpp
@@ -208,12 +208,11 @@ static std::vector<CAddress> ConvertSeeds(const std::vector<uint8_t> &vSeedsIn)
 // one by discovery.
 CService GetLocalAddress(const CNetAddr& addrPeer)
 {
-    CService ret{CNetAddr(), GetListenPort()};
     CService addr;
     if (GetLocal(addr, &addrPeer)) {
-        ret = CService{addr};
+        return addr;
     }
-    return ret;
+    return CService{CNetAddr(), GetListenPort()};
 }
 
 static int GetnScore(const CService& addr)

Original file line number	Diff line number	Diff line change
`@@ -208,12 +208,11 @@ static std::vector<CAddress> ConvertSeeds(const std::vector<uint8_t> &vSeedsIn)`
`208`	`208`	`// one by discovery.`
`209`	`209`	`CService GetLocalAddress(const CNetAddr& addrPeer)`
`210`	`210`	`{`
`211`		`- CService ret{CNetAddr(), GetListenPort()};`
`212`	`211`	`CService addr;`
`213`	`212`	`if (GetLocal(addr, &addrPeer)) {`
`214`		`- ret = CService{addr};`
	`213`	`+ return addr;`
`215`	`214`	`}`
`216`		`- return ret;`
	`215`	`+ return CService{CNetAddr(), GetListenPort()};`
`217`	`216`	`}`
`218`	`217`
`219`	`218`	`static int GetnScore(const CService& addr)`