aboutsummaryrefslogtreecommitdiff
path: root/src/netbase.cpp
diff options
context:
space:
mode:
authorPavel Janík <Pavel@Janik.cz>2016-08-15 14:10:07 +0200
committerPavel Janík <Pavel@Janik.cz>2016-08-15 14:10:07 +0200
commitb7c349d5e7c207bb7a2e7469c3e5522c9909c17f (patch)
tree72334fef6ee1ea35717aa8295589b0a01691dba9 /src/netbase.cpp
parent1030fa718c59c29d3208af13e853457b7ac59d2e (diff)
downloadbitcoin-b7c349d5e7c207bb7a2e7469c3e5522c9909c17f.tar.xz
Do not shadow variables in networking code
Diffstat (limited to 'src/netbase.cpp')
-rw-r--r--src/netbase.cpp6
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)