From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 3 Dec 2010 01:56:04 +0000 (+1300)
Subject: Fix size obscures MemBlob::size warnings.
X-Git-Tag: take1~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abbb7c72bed913519dfbe50dba7c420c4fc0a266;p=thirdparty%2Fsquid.git

Fix size obscures MemBlob::size warnings.
---

diff --git a/src/MemBlob.cc b/src/MemBlob.cc
index ad16dbef44..7da391d232 100644
--- a/src/MemBlob.cc
+++ b/src/MemBlob.cc
@@ -113,18 +113,18 @@ MemBlob::~MemBlob()
  * by MemPools via memAllocString.
  */
 MemBlob::size_type
-MemBlob::calcAllocSize(const size_type size) const
+MemBlob::calcAllocSize(const size_type sz) const
 {
-    if (size <= 36) return 36;
-    if (size <= 128) return 128;
-    if (size <= 512) return 512;
-    if (size <= 4096) return RoundTo(size, 512);
+    if (sz <= 36) return 36;
+    if (sz <= 128) return 128;
+    if (sz <= 512) return 512;
+    if (sz <= 4096) return RoundTo(sz, 512);
     // XXX: recover squidSystemPageSize functionality. It's easy for
     //      the main squid, harder for tests
 #if 0
-    return RoundTo(size, squidSystemPageSize);
+    return RoundTo(sz, squidSystemPageSize);
 #else
-    return RoundTo(size, 4096);
+    return RoundTo(sz, 4096);
 #endif
 }