Do not shadow variables in networking code

paveljanik · paveljanik · commit b7c349d5e7c2 · 2016-08-15T14:10:07.000+02:00
diff --git a/src/net.cpp b/src/net.cpp
@@ -66,7 +66,7 @@ namespace {
         SOCKET socket;
         bool whitelisted;
 
-        ListenSocket(SOCKET socket, bool whitelisted) : socket(socket), whitelisted(whitelisted) {}
+        ListenSocket(SOCKET _socket, bool _whitelisted) : socket(_socket), whitelisted(_whitelisted) {}
     };
 }
 
diff --git a/src/net.h b/src/net.h
@@ -509,21 +509,21 @@ class CNode
 
 
 
-    void AddAddressKnown(const CAddress& addr)
+    void AddAddressKnown(const CAddress& _addr)
     {
-        addrKnown.insert(addr.GetKey());
+        addrKnown.insert(_addr.GetKey());
     }
 
-    void PushAddress(const CAddress& addr)
+    void PushAddress(const CAddress& _addr)
     {
         // Known checking here is only to save space from duplicates.
         // SendMessages will filter it again for knowns that were added
         // after addresses were pushed.
-        if (addr.IsValid() && !addrKnown.contains(addr.GetKey())) {
+        if (_addr.IsValid() && !addrKnown.contains(_addr.GetKey())) {
             if (vAddrToSend.size() >= MAX_ADDR_TO_SEND) {
-                vAddrToSend[insecure_rand() % vAddrToSend.size()] = addr;
+                vAddrToSend[insecure_rand() % vAddrToSend.size()] = _addr;
             } else {
-                vAddrToSend.push_back(addr);
+                vAddrToSend.push_back(_addr);
             }
         }
     }
diff --git a/src/netaddress.cpp b/src/netaddress.cpp
@@ -197,8 +197,8 @@ bool CNetAddr::IsValid() const
         return false;
 
     // unspecified IPv6 address (::/128)
-    unsigned char ipNone[16] = {};
-    if (memcmp(ip, ipNone, 16) == 0)
+    unsigned char ipNone6[16] = {};
+    if (memcmp(ip, ipNone6, 16) == 0)
         return false;
 
     // documentation IPv6 address
diff --git 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)
diff --git a/src/netbase.h b/src/netbase.h
@@ -29,7 +29,7 @@ class proxyType
 {
 public:
     proxyType(): randomize_credentials(false) {}
-    proxyType(const CService &proxy, bool randomize_credentials=false): proxy(proxy), randomize_credentials(randomize_credentials) {}
+    proxyType(const CService &_proxy, bool _randomize_credentials=false): proxy(_proxy), randomize_credentials(_randomize_credentials) {}
 
     bool IsValid() const { return proxy.IsValid(); }
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ namespace {`
`66`	`66`	`SOCKET socket;`
`67`	`67`	`bool whitelisted;`
`68`	`68`
`69`		`- ListenSocket(SOCKET socket, bool whitelisted) : socket(socket), whitelisted(whitelisted) {}`
	`69`	`+ ListenSocket(SOCKET _socket, bool _whitelisted) : socket(_socket), whitelisted(_whitelisted) {}`
`70`	`70`	`};`
`71`	`71`	`}`
`72`	`72`
Original file line number	Diff line number	Diff line change
`@@ -509,21 +509,21 @@ class CNode`
`509`	`509`
`510`	`510`
`511`	`511`
`512`		`- void AddAddressKnown(const CAddress& addr)`
	`512`	`+ void AddAddressKnown(const CAddress& _addr)`
`513`	`513`	`{`
`514`		`- addrKnown.insert(addr.GetKey());`
	`514`	`+ addrKnown.insert(_addr.GetKey());`
`515`	`515`	`}`
`516`	`516`
`517`		`- void PushAddress(const CAddress& addr)`
	`517`	`+ void PushAddress(const CAddress& _addr)`
`518`	`518`	`{`
`519`	`519`	`// Known checking here is only to save space from duplicates.`
`520`	`520`	`// SendMessages will filter it again for knowns that were added`
`521`	`521`	`// after addresses were pushed.`
`522`		`- if (addr.IsValid() && !addrKnown.contains(addr.GetKey())) {`
	`522`	`+ if (_addr.IsValid() && !addrKnown.contains(_addr.GetKey())) {`
`523`	`523`	`if (vAddrToSend.size() >= MAX_ADDR_TO_SEND) {`
`524`		`- vAddrToSend[insecure_rand() % vAddrToSend.size()] = addr;`
	`524`	`+ vAddrToSend[insecure_rand() % vAddrToSend.size()] = _addr;`
`525`	`525`	`} else {`
`526`		`- vAddrToSend.push_back(addr);`
	`526`	`+ vAddrToSend.push_back(_addr);`
`527`	`527`	`}`
`528`	`528`	`}`
`529`	`529`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class proxyType`
`29`	`29`	`{`
`30`	`30`	`public:`
`31`	`31`	`proxyType(): randomize_credentials(false) {}`
`32`		`- proxyType(const CService &proxy, bool randomize_credentials=false): proxy(proxy), randomize_credentials(randomize_credentials) {}`
	`32`	`+ proxyType(const CService &_proxy, bool _randomize_credentials=false): proxy(_proxy), randomize_credentials(_randomize_credentials) {}`
`33`	`33`
`34`	`34`	`bool IsValid() const { return proxy.IsValid(); }`
`35`	`35`