From: Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Date: Thu, 22 Sep 2011 21:42:46 +0000 (-0600)
Subject: Remove SwapDir::reconfigure() arguments since they are not used.
X-Git-Tag: BumpSslServerFirst.take01~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c605997067e4fa37d9d6a3a5d78890176829f5f8;p=thirdparty%2Fsquid.git

Remove SwapDir::reconfigure() arguments since they are not used.

Before the change, SwapDir::reconfigure() took index and path
arguments, but none of them was actually used: neither index nor path
can be changed during reconfigure.  And both index and path are
available as SwapDir members so there is no reason to have these
arguments.
---

diff --git a/src/SwapDir.h b/src/SwapDir.h
index 42058d1658..f43b05c0e9 100644
--- a/src/SwapDir.h
+++ b/src/SwapDir.h
@@ -125,7 +125,7 @@ public:
 
     SwapDir(char const *aType);
     virtual ~SwapDir();
-    virtual void reconfigure(int, char *) = 0;
+    virtual void reconfigure() = 0;
     char const *type() const;
 
     virtual bool needsDiskStrand() const; ///< needs a dedicated kid process
diff --git a/src/fs/coss/CossSwapDir.h b/src/fs/coss/CossSwapDir.h
index 1a74fcb9e1..6929d81d77 100644
--- a/src/fs/coss/CossSwapDir.h
+++ b/src/fs/coss/CossSwapDir.h
@@ -48,7 +48,7 @@ public:
     virtual void writeCleanDone();
     virtual void logEntry(const StoreEntry & e, int op) const;
     virtual void parse (int index, char *path);
-    virtual void reconfigure (int, char *);
+    virtual void reconfigure();
     virtual void swappedOut(const StoreEntry &e);
     virtual uint64_t currentSize() const { return cur_size; }
     virtual uint64_t currentCount() const { return n_disk_objects; }
diff --git a/src/fs/coss/store_dir_coss.cc b/src/fs/coss/store_dir_coss.cc
index 1f65934fec..b9767ce7fb 100644
--- a/src/fs/coss/store_dir_coss.cc
+++ b/src/fs/coss/store_dir_coss.cc
@@ -1036,7 +1036,7 @@ CossSwapDir::parse(int anIndex, char *aPath)
 
 
 void
-CossSwapDir::reconfigure(int index, char *path)
+CossSwapDir::reconfigure()
 {
     const int i = GetInteger();
     if (i <= 0)
diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc
index 7522df9e29..81af850bb0 100644
--- a/src/fs/rock/RockSwapDir.cc
+++ b/src/fs/rock/RockSwapDir.cc
@@ -265,7 +265,7 @@ Rock::SwapDir::parse(int anIndex, char *aPath)
 }
 
 void
-Rock::SwapDir::reconfigure(int, char *aPath)
+Rock::SwapDir::reconfigure()
 {
     parseSize(true);
     parseOptions(1);
diff --git a/src/fs/rock/RockSwapDir.h b/src/fs/rock/RockSwapDir.h
index 92da409534..4e56c42565 100644
--- a/src/fs/rock/RockSwapDir.h
+++ b/src/fs/rock/RockSwapDir.h
@@ -24,7 +24,7 @@ public:
     virtual ~SwapDir();
 
     /* public ::SwapDir API */
-    virtual void reconfigure(int, char *);
+    virtual void reconfigure();
     virtual StoreSearch *search(String const url, HttpRequest *);
     virtual StoreEntry *get(const cache_key *key);
     virtual void get(String const, STOREGETCLIENT, void * cbdata);
diff --git a/src/fs/ufs/store_dir_ufs.cc b/src/fs/ufs/store_dir_ufs.cc
index bcd1aa0ac2..129629c97f 100644
--- a/src/fs/ufs/store_dir_ufs.cc
+++ b/src/fs/ufs/store_dir_ufs.cc
@@ -110,7 +110,7 @@ UFSSwapDir::parseSizeL1L2()
  */
 
 void
-UFSSwapDir::reconfigure(int aIndex, char *aPath)
+UFSSwapDir::reconfigure()
 {
     parseSizeL1L2();
     parseOptions(1);
diff --git a/src/fs/ufs/ufscommon.h b/src/fs/ufs/ufscommon.h
index 35fad81a08..7561e8b965 100644
--- a/src/fs/ufs/ufscommon.h
+++ b/src/fs/ufs/ufscommon.h
@@ -73,7 +73,7 @@ public:
     virtual void writeCleanDone();
     virtual void logEntry(const StoreEntry & e, int op) const;
     virtual void parse(int index, char *path);
-    virtual void reconfigure(int, char *);
+    virtual void reconfigure();
     virtual int callback();
     virtual void sync();
     virtual void swappedOut(const StoreEntry &e);
diff --git a/src/tests/TestSwapDir.cc b/src/tests/TestSwapDir.cc
index 0394a8ca41..d99d28bd7f 100644
--- a/src/tests/TestSwapDir.cc
+++ b/src/tests/TestSwapDir.cc
@@ -28,7 +28,7 @@ TestSwapDir::stat(StoreEntry &) const
 }
 
 void
-TestSwapDir::reconfigure(int, char*)
+TestSwapDir::reconfigure()
 {}
 
 void
diff --git a/src/tests/TestSwapDir.h b/src/tests/TestSwapDir.h
index 0908d1d336..e5d51cb870 100644
--- a/src/tests/TestSwapDir.h
+++ b/src/tests/TestSwapDir.h
@@ -18,7 +18,7 @@ public:
     virtual void stat(StoreEntry &) const; /* output stats to the provided store entry */
     virtual void swappedOut(const StoreEntry &e) {}
 
-    virtual void reconfigure(int, char*);
+    virtual void reconfigure();
     virtual void init();
     virtual bool canStore(const StoreEntry &e, int64_t diskSpaceNeeded, int &load) const;
     virtual StoreIOState::Pointer createStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STIOCB *, void *);