diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-08-12 10:52:31 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-08-12 10:52:42 +0200 |
| commit | 89b219412495489c870f0117de01ae35ae719395 (patch) | |
| tree | 6ab434840c39d37f6eb998c0f234f0baf92da7c8 | |
| parent | 27724c23f72b17142f95e082e23eee26e93791f4 (diff) | |
| parent | daabd4121114fe6f780bccab311a522c0717c5b8 (diff) | |
| download | bitcoin-89b219412495489c870f0117de01ae35ae719395.tar.xz | |
Merge bitcoin/bitcoin#25814: net: simplify GetLocalAddress()
daabd4121114fe6f780bccab311a522c0717c5b8 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 daabd4121114fe6f780bccab311a522c0717c5b8
aureleoules:
ACK daabd4121114fe6f780bccab311a522c0717c5b8.
w0xlt:
ACK https://github.com/bitcoin/bitcoin/pull/25814/commits/daabd4121114fe6f780bccab311a522c0717c5b8
Tree-SHA512: 4bbd3746bc30fbc05bb32b58bb122c938acd849c0f72f1d3e8170557c1999ec26a888e06e874c3fc22562a2becddc7d817db7d174e0e1b383e8d74c39aa1e898
| -rw-r--r-- | src/net.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/net.cpp b/src/net.cpp index e87ac079b5..865ce2ea97 100644 --- 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) |