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 42058d165822e26378ab1a998d07370f5fdfb6a7..f43b05c0e99ecc8926d4b35372d292527f185751 100644 (file)
--- 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 1a74fcb9e1859f82d2a728a6259ab2fc06f30c01..6929d81d7769e3c753ba7210b4e995ceb22d87c2 100644 (file)
--- 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 1f65934fece5a90db5b11d0996f7dedfdfa6d164..b9767ce7fbe4e9dd16f20d54976391f0564586f0 100644 (file)
--- 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 7522df9e29dcbd56f2f8cb0ef16e6ff984ebe8d6..81af850bb0e5e93f1e4d5112e1a2a6e06db2a8b3 100644 (file)
--- 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 92da4095346da65d421ad1036d77eddb3b2ff9fb..4e56c425658ce1730d7eb650fbb0e948e94ed621 100644 (file)
--- 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 bcd1aa0ac2090f2e3c4ed770ee07e3c0c9e888b4..129629c97f05b7704b34f4586e23f5e50b31afc7 100644 (file)
--- 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 35fad81a081a4be8b4abffdc013a2a6fec1de03e..7561e8b9657d9259c2361fc9764cd79b1c64cbc6 100644 (file)
--- 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 0394a8ca41d67ad9cdcdc608694c0d24be209a31..d99d28bd7f910efcec4bd786d967831e3c65c82b 100644 (file)
--- 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 0908d1d336745e0640ef089471f4c872ff845d93..e5d51cb87016d62168dca37feb8bc8d9e564d86b 100644 (file)
--- 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 *);