From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 2 Jan 2013 23:40:49 +0000 (+1300)
Subject: Bug 3676: Fix various shadowed variables
X-Git-Tag: SQUID_3_4_0_1~396
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f621cd093274c38b37c50fce889756c34a1f073;p=thirdparty%2Fsquid.git

Bug 3676: Fix various shadowed variables

Also, fixes logformat dumper to output 'logformat' instead of 'format'.
'format' directive is the planned future name but is not yet parsed.

 Detected by GCC 4.7 with -Wshadow
---

diff --git a/src/CommCalls.h b/src/CommCalls.h
index 3a74154fb5..fe8b735318 100644
--- a/src/CommCalls.h
+++ b/src/CommCalls.h
@@ -169,9 +169,9 @@ public:
     typedef Params_ Params;
     typedef void (C::*Method)(const Params &io);
 
-    CommCbMemFunT(const CbcPointer<C> &job, Method meth): JobDialer<C>(job),
-            CommDialerParamsT<Params_>(job.get()),
-            method(meth) {}
+    CommCbMemFunT(const CbcPointer<C> &aJob, Method aMeth): JobDialer<C>(aJob),
+            CommDialerParamsT<Params_>(aJob.get()),
+            method(aMeth) {}
 
     virtual bool canDial(AsyncCall &c) {
         return JobDialer<C>::canDial(c) &&
diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc
index d0272af305..0cb62c434a 100644
--- a/src/comm/ConnOpener.cc
+++ b/src/comm/ConnOpener.cc
@@ -112,7 +112,7 @@ Comm::ConnOpener::getHost() const
  * NP: on errors the earlyAbort call should be cancelled first with a reason.
  */
 void
-Comm::ConnOpener::doneConnecting(comm_err_t status, int xerrno)
+Comm::ConnOpener::doneConnecting(comm_err_t errFlag, int xerrno)
 {
     // only mark the address good/bad AFTER connect is finished.
     if (host_ != NULL) {
@@ -131,7 +131,7 @@ Comm::ConnOpener::doneConnecting(comm_err_t status, int xerrno)
         typedef CommConnectCbParams Params;
         Params &params = GetCommParams<Params>(callback_);
         params.conn = conn_;
-        params.flag = status;
+        params.flag = errFlag;
         params.xerrno = xerrno;
         ScheduleCallHere(callback_);
         callback_ = NULL;
diff --git a/src/comm/ConnOpener.h b/src/comm/ConnOpener.h
index 45e4c41287..e3fd1aeb3f 100644
--- a/src/comm/ConnOpener.h
+++ b/src/comm/ConnOpener.h
@@ -40,7 +40,7 @@ private:
 
     void earlyAbort(const CommCloseCbParams &);
     void timeout(const CommTimeoutCbParams &);
-    void doneConnecting(comm_err_t status, int xerrno);
+    void doneConnecting(comm_err_t errFlag, int xerrno);
     static void InProgressConnectRetry(int fd, void *data);
     static void DelayedConnectRetry(void *data);
     void connect();
diff --git a/src/format/Format.cc b/src/format/Format.cc
index d07bfc96bd..b65c817e35 100644
--- a/src/format/Format.cc
+++ b/src/format/Format.cc
@@ -79,16 +79,16 @@ Format::Format::parse(const char *def)
 }
 
 void
-Format::Format::dump(StoreEntry * entry, const char *name)
+Format::Format::dump(StoreEntry * entry, const char *directiveName)
 {
     debugs(46, 4, HERE);
 
     // loop rather than recursing to conserve stack space.
-    for (Format *format = this; format; format = format->next) {
-        debugs(46, 3, HERE << "Dumping format definition for " << format->name);
-        storeAppendPrintf(entry, "format %s ", format->name);
+    for (Format *fmt = this; fmt; fmt = fmt->next) {
+        debugs(46, 3, HERE << "Dumping format definition for " << fmt->name);
+        storeAppendPrintf(entry, "%s %s ", directiveName, fmt->name);
 
-        for (Token *t = format->format; t; t = t->next) {
+        for (Token *t = fmt->format; t; t = t->next) {
             if (t->type == LFT_STRING)
                 storeAppendPrintf(entry, "%s", t->data.string);
             else {
diff --git a/src/format/Format.h b/src/format/Format.h
index 2415815c08..a998327cad 100644
--- a/src/format/Format.h
+++ b/src/format/Format.h
@@ -41,7 +41,7 @@ public:
     void assemble(MemBuf &mb, const AccessLogEntryPointer &al, int logSequenceNumber) const;
 
     /// dump this whole list of formats into the provided StoreEntry
-    void dump(StoreEntry * entry, const char *name);
+    void dump(StoreEntry * entry, const char *directiveName);
 
     char *name;
     Token *format;
diff --git a/src/ipc/StoreMap.h b/src/ipc/StoreMap.h
index 444073a359..fcb7f9d1a3 100644
--- a/src/ipc/StoreMap.h
+++ b/src/ipc/StoreMap.h
@@ -169,8 +169,8 @@ StoreMapWithExtras<ExtrasT>::Init(const char *const path, const int limit)
 }
 
 template <class ExtrasT>
-StoreMapWithExtras<ExtrasT>::StoreMapWithExtras(const char *const path):
-        StoreMap(path)
+StoreMapWithExtras<ExtrasT>::StoreMapWithExtras(const char *const aPath):
+        StoreMap(aPath)
 {
     const size_t sharedSizeWithoutExtras =
         Shared::SharedMemorySize(entryLimit(), 0);