From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Thu, 22 Sep 2011 22:02:39 +0000 (-0600)
Subject: Fixed SwapDir::reconfigure() arguments broken by my poor conflict resolution.
X-Git-Tag: BumpSslServerFirst.take01~133
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afa75e4b341639d6867f09ea3276d147ec4e5356;p=thirdparty%2Fsquid.git

Fixed SwapDir::reconfigure() arguments broken by my poor conflict resolution.
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 354a91e2d6..ad9a74d9ee 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1959,7 +1959,7 @@ parse_cachedir(SquidConfig::_cacheSwap * swap)
                 return;
             }
 
-            sd->reconfigure (i, path_str);
+            sd->reconfigure();
 
             update_maxobjsize();