Fixed some cases of variable shadowing

diff --git a/src/errorpage.cc b/src/errorpage.cc
index 5a70d686e06fae590dccb69880fe4b17e5032da6..f0424f2b048011010e206f2266207db0ccd011b5 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -862,7 +862,7 @@ ErrorState::Convert(char token, bool url_presentable)
 }
 
 void
-ErrorState::DenyInfoLocation(const char *name, HttpRequest *request, MemBuf &result)
+ErrorState::DenyInfoLocation(const char *name, HttpRequest *aRequest, MemBuf &result)
 {
     char const *m = name;
     char const *p = m;

diff --git a/src/forward.cc b/src/forward.cc
index 9f789d3ece0dc1031de825198823c644d635ceb4..4a65660ded34af936c5607e19114e257857a3365 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -869,14 +869,14 @@ FwdState::connectStart()
 
     debugs(17, 3, "fwdConnectStart: got outgoing addr " << outgoing << ", tos " << tos);
 
-    int flags = COMM_NONBLOCKING;
+    int localFlags = COMM_NONBLOCKING;
     if (request->flags.spoof_client_ip) {
         if (!fs->_peer || !fs->_peer->options.no_tproxy)
-            flags |= COMM_TRANSPARENT;
+            localFlags |= COMM_TRANSPARENT;
         // else no tproxy today ...
     }
 
-    fd = comm_openex(SOCK_STREAM, IPPROTO_TCP, outgoing, flags, tos, url);
+    fd = comm_openex(SOCK_STREAM, IPPROTO_TCP, outgoing, localFlags, tos, url);
 
     debugs(17, 3, "fwdConnectStart: got TCP FD " << fd);
 
@@ -912,11 +912,11 @@ FwdState::connectStart()
     commSetTimeout(fd, ctimeout, fwdConnectTimeoutWrapper, this);
 
 #if LINUX_TPROXY2
-    if (!fs->_peer && request->flags.spoof_client_ip) {
+    if (!fs->_peer && request->localFlags.spoof_client_ip) {
         // try to set the outgoing address using TPROXY v2
         // if it fails we abort any further TPROXY actions on this connection
         if (IpInterceptor.SetTproxy2OutgoingAddr(int fd, const IpAddress &src) == -1) {
-            request->flags.spoof_client_ip = 0;
+            request->localFlags.spoof_client_ip = 0;
         }
     }
 #endif

diff --git a/src/store_dir.cc b/src/store_dir.cc
index 74d40c701f955960e0534cc4cc796d433f3c1c71..55368f551a8cdc54106f03d219134cf9a1790017 100644 (file)
--- a/src/store_dir.cc
+++ b/src/store_dir.cc
@@ -919,10 +919,10 @@ StoreSearchHashIndex::~StoreSearchHashIndex()
 {}
 
 void
-StoreSearchHashIndex::next(void (callback)(void *cbdata), void *cbdata)
+StoreSearchHashIndex::next(void (aCallback)(void *), void *aCallbackData)
 {
     next();
-    callback (cbdata);
+    aCallback (aCallbackData);
 }
 
 bool