diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-02 12:32:49 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-02 12:51:56 +0200 |
| commit | cbe9ae8c69b947c8cdff2e0fbf5b57c9aa09b770 (patch) | |
| tree | da34cdef9c97e3bb18178dfd7733f21937942d3d /src/netbase.cpp | |
| parent | 381d0ddc8aaa5519c18b8eb8fd59db798546af44 (diff) | |
| parent | b7c349d5e7c207bb7a2e7469c3e5522c9909c17f (diff) | |
| download | bitcoin-cbe9ae8c69b947c8cdff2e0fbf5b57c9aa09b770.tar.xz | |
Merge #8466: [Trivial] Do not shadow variables in networking code
b7c349d Do not shadow variables in networking code (Pavel JanÃk)
Diffstat (limited to 'src/netbase.cpp')
| -rw-r--r-- | src/netbase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/netbase.cpp b/src/netbase.cpp index 4f243ec6f5..7d7f1b6788 100644 --- a/src/netbase.cpp +++ b/src/netbase.cpp @@ -631,8 +631,8 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest SplitHostPort(std::string(pszDest), port, strDest); - proxyType nameProxy; - GetNameProxy(nameProxy); + proxyType proxy; + GetNameProxy(proxy); std::vector<CService> addrResolved; if (Lookup(strDest.c_str(), addrResolved, port, fNameLookup && !HaveNameProxy(), 256)) { @@ -646,7 +646,7 @@ bool ConnectSocketByName(CService &addr, SOCKET& hSocketRet, const char *pszDest if (!HaveNameProxy()) return false; - return ConnectThroughProxy(nameProxy, strDest, port, hSocketRet, nTimeout, outProxyConnectionFailed); + return ConnectThroughProxy(proxy, strDest, port, hSocketRet, nTimeout, outProxyConnectionFailed); } bool LookupSubNet(const char* pszName, CSubNet& ret) |