From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 20 Dec 2016 13:49:23 +0000 (+1300)
Subject: Fix shadowing of member 'type' in SchemeConfig
X-Git-Tag: M-staged-PR71~333^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=644b0587cc6495cfabfcba76243a71dca0e1a20c;p=thirdparty%2Fsquid.git

Fix shadowing of member 'type' in SchemeConfig
---

diff --git a/src/auth/SchemeConfig.cc b/src/auth/SchemeConfig.cc
index a1b477b8d1..4b86c16c78 100644
--- a/src/auth/SchemeConfig.cc
+++ b/src/auth/SchemeConfig.cc
@@ -141,31 +141,31 @@ Auth::SchemeConfig::dump(StoreEntry *entry, const char *name, Auth::SchemeConfig
     if (!authenticateProgram)
         return false; // not configured
 
-    const char *type = scheme->type();
+    const char *schemeType = scheme->type();
 
     wordlist *list = authenticateProgram;
-    storeAppendPrintf(entry, "%s %s", name, type);
+    storeAppendPrintf(entry, "%s %s", name, schemeType);
     while (list != NULL) {
         storeAppendPrintf(entry, " %s", list->key);
         list = list->next;
     }
     storeAppendPrintf(entry, "\n");
 
-    storeAppendPrintf(entry, "%s %s realm " SQUIDSBUFPH "\n", name, type, SQUIDSBUFPRINT(realm));
+    storeAppendPrintf(entry, "%s %s realm " SQUIDSBUFPH "\n", name, schemeType, SQUIDSBUFPRINT(realm));
 
     storeAppendPrintf(entry, "%s %s children %d startup=%d idle=%d concurrency=%d\n",
-                      name, type,
+                      name, schemeType,
                       authenticateChildren.n_max, authenticateChildren.n_startup,
                       authenticateChildren.n_idle, authenticateChildren.concurrency);
 
     if (keyExtrasLine.size() > 0) // default is none
-        storeAppendPrintf(entry, "%s %s key_extras \"%s\"\n", name, type, keyExtrasLine.termedBuf());
+        storeAppendPrintf(entry, "%s %s key_extras \"%s\"\n", name, schemeType, keyExtrasLine.termedBuf());
 
     if (!keep_alive) // default is on
-        storeAppendPrintf(entry, "%s %s keep_alive off\n", name, type);
+        storeAppendPrintf(entry, "%s %s keep_alive off\n", name, schemeType);
 
     if (utf8) // default is off
-        storeAppendPrintf(entry, "%s %s utf8 on\n", name, type);
+        storeAppendPrintf(entry, "%s %s utf8 on\n", name, schemeType);
 
     return true;
 }