Renamed Vector::clean to clear

diff --git a/src/ClientDelayConfig.cc b/src/ClientDelayConfig.cc
index 0d95212f786ec722576c39bf3035286303eeda83..a588fd4aeaea08f314626b304ca769ee66663c1b 100644 (file)
--- a/src/ClientDelayConfig.cc
+++ b/src/ClientDelayConfig.cc
@@ -30,7 +30,7 @@ ClientDelayConfig::finalize()
 
 void ClientDelayConfig::freePoolCount()
 {
-    pools.clean();
+    pools.clear();
 }
 
 void ClientDelayConfig::dumpPoolCount(StoreEntry * entry, const char *name) const

diff --git a/src/ExternalACLEntry.cc b/src/ExternalACLEntry.cc
index a8a459cd079624fc6ae575c6a7ce612e28cf6998..6e3a969e1647eaaa736462257af61d051eaecdc1 100644 (file)
--- a/src/ExternalACLEntry.cc
+++ b/src/ExternalACLEntry.cc
@@ -70,7 +70,7 @@ ExternalACLEntry::update(ExternalACLEntryData const &someData)
     result = someData.result;
 
     // replace all notes. not combine
-    notes.entries.clean();
+    notes.entries.clear();
     notes.append(&someData.notes);
 
 #if USE_AUTH

diff --git a/src/FwdState.cc b/src/FwdState.cc
index 6847fed133923852177ff5c66f2836dc691baf19..881cb94dad15ab2e855c3cd1a5d39530ee53c830 100644 (file)
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -112,7 +112,7 @@ FwdState::abort(void* d)
     } else {
         debugs(17, 7, HERE << "store entry aborted; no connection to close");
     }
-    fwd->serverDestinations.clean();
+    fwd->serverDestinations.clear();
     fwd->self = NULL;
 }
 
@@ -277,7 +277,7 @@ FwdState::~FwdState()
         serverConn->close();
     }
 
-    serverDestinations.clean();
+    serverDestinations.clear();
 
     debugs(17, 3, HERE << "FwdState destructor done");
 }

diff --git a/src/HttpHdrRange.cc b/src/HttpHdrRange.cc
index 206c4ad320707ce938066f73cb88a1240c1bc8e2..6e1810c3508679cf1236cc826e998da7cccc5262 100644 (file)
--- a/src/HttpHdrRange.cc
+++ b/src/HttpHdrRange.cc
@@ -341,7 +341,7 @@ void
 HttpHdrRange::merge (Vector<HttpHdrRangeSpec *> &basis)
 {
     /* reset old array */
-    specs.clean();
+    specs.clear();
     /* merge specs:
      * take one spec from "goods" and merge it with specs from
      * "specs" (if any) until there is no overlap */

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index f54e9c228f6376224f41318b1f32229bfa49e1e5..5a96f5a26ec671771dc28f0736ebc579657a6300 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -474,7 +474,7 @@ HttpHeader::clean()
             delete e;
         }
     }
-    entries.clean();
+    entries.clear();
     httpHeaderMaskInit(&mask, 0);
     len = 0;
     PROF_stop(HttpHeaderClean);

diff --git a/src/Notes.cc b/src/Notes.cc
index ad84e0ea6bff4af1ac28851f77e30cfabdd446dc..4cb731347eb56f2aff8323b3fcc0cdf7492fd723 100644 (file)
--- a/src/Notes.cc
+++ b/src/Notes.cc
@@ -146,7 +146,7 @@ Notes::dump(StoreEntry *entry, const char *key)
 void
 Notes::clean()
 {
-    notes.clean();
+    notes.clear();
 }
 
 NotePairs::~NotePairs()

diff --git a/src/Notes.h b/src/Notes.h
index 6edf828f16088008bfdbd69434b94f64793f9ba3..f9e5ed0ce452b4720e4684e8eea29fc7da655cdb 100644 (file)
--- a/src/Notes.h
+++ b/src/Notes.h
@@ -76,7 +76,7 @@ public:
 
     Notes(const char *aDescr, const char **metasBlacklist, bool allowFormatted = false): descr(aDescr), blacklisted(metasBlacklist), formattedValues(allowFormatted) {}
     Notes(): descr(NULL), blacklisted(NULL) {}
-    ~Notes() { notes.clean(); }
+    ~Notes() { notes.clear(); }
     /**
      * Parse a notes line and returns a pointer to the
      * parsed Note object.

diff --git a/src/adaptation/Config.cc b/src/adaptation/Config.cc
index 2794a4cdd22504196209cc7123ab1845c1327826..d133c493e61f05d32ad444d8a2b2f5ef5bf1039c 100644 (file)
--- a/src/adaptation/Config.cc
+++ b/src/adaptation/Config.cc
@@ -139,7 +139,7 @@ Adaptation::Config::clear()
     const ServiceConfigs& configs = serviceConfigs;
     for (SCI cfg = configs.begin(); cfg != configs.end(); ++cfg)
         removeService((*cfg)->key);
-    serviceConfigs.clean();
+    serviceConfigs.clear();
     debugs(93, 3, HERE << "rules: " << AllRules().size() << ", groups: " <<
            AllGroups().size() << ", services: " << serviceConfigs.size());
 }
@@ -163,7 +163,7 @@ Adaptation::Config::freeService()
 
     DetachServices();
 
-    serviceConfigs.clean();
+    serviceConfigs.clear();
 }
 
 void
@@ -210,7 +210,7 @@ Adaptation::Config::finalize()
     debugs(93,3, HERE << "Created " << created << " adaptation services");
 
     // services remember their configs; we do not have to
-    serviceConfigs.clean();
+    serviceConfigs.clear();
     return true;
 }
 

diff --git a/src/adaptation/DynamicGroupCfg.cc b/src/adaptation/DynamicGroupCfg.cc
index f5ebf4a3d779f5b348f459cdf08d4a81db2e7590..5d06f78fdd89bd8c3b24056201d456e804374f8b 100644 (file)
--- a/src/adaptation/DynamicGroupCfg.cc
+++ b/src/adaptation/DynamicGroupCfg.cc
@@ -18,5 +18,5 @@ void
 Adaptation::DynamicGroupCfg::clear()
 {
     id.clean();
-    services.clean();
+    services.clear();
 }

diff --git a/src/adaptation/ServiceGroups.cc b/src/adaptation/ServiceGroups.cc
index ad196bc1a9a45b74fae1a68b142474ac11770856..28e7d83763e20b868e9ec3f3b9a8c49b593bbdf5 100644 (file)
--- a/src/adaptation/ServiceGroups.cc
+++ b/src/adaptation/ServiceGroups.cc
@@ -48,7 +48,7 @@ Adaptation::ServiceGroup::finalize()
         }
         s.cut(s.size() - 1);
         debugs(93, DBG_IMPORTANT, "Adaptation group '" << id << "' contains disabled member(s) after reconfiguration: " << s);
-        removedServices.clean();
+        removedServices.clear();
     }
 
     String baselineKey;

diff --git a/src/auth/Gadgets.cc b/src/auth/Gadgets.cc
index f31c9049cd54d9daa514edc64b545e547d41cb51..03c1c2e930f423d01e452e120be7df34b2b8e066 100644 (file)
--- a/src/auth/Gadgets.cc
+++ b/src/auth/Gadgets.cc
@@ -133,7 +133,7 @@ authenticateReset(void)
     authenticateRotate();
 
     /* free current global config details too. */
-    Auth::TheConfig.clean();
+    Auth::TheConfig.clear();
 }
 
 AuthUserHashPointer::AuthUserHashPointer(Auth::User::Pointer anAuth_user):

diff --git a/src/base/Vector.h b/src/base/Vector.h
index 69b7669942531f75ea0d646b9c73b81f7f01b1a1..71c753890f8afc228d5658f6190507e27b6bc689 100644 (file)
--- a/src/base/Vector.h
+++ b/src/base/Vector.h
@@ -96,7 +96,7 @@ public:
     ~Vector();
     Vector(Vector const &);
     Vector &operator = (Vector const &);
-    void clean();
+    void clear();
     void reserve (size_t capacity);
     void push_back (E);
     Vector &operator += (E item) {push_back(item); return *this;};
@@ -147,12 +147,12 @@ Vector<E>::Vector() : capacity (0), count(0), items (NULL)
 template<class E>
 Vector<E>::~Vector()
 {
-    clean();
+    clear();
 }
 
 template<class E>
 void
-Vector<E>::clean()
+Vector<E>::clear()
 {
     /* could also warn if some objects are left */
     delete[] items;
@@ -316,7 +316,7 @@ template<class E>
 Vector<E> &
 Vector<E>::operator = (Vector<E> const &old)
 {
-    clean();
+    clear();
     reserve (old.size());
 
     for (size_t counter = 0; counter < old.size(); ++counter)

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index d1e8e3eead3884a56e9e51b074a3ba97ca7aaaa9..3bb3e7115cb398fa2496d0c93a6efe099e8674a0 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1871,7 +1871,7 @@ static void
 free_authparam(Auth::ConfigVector * cfg)
 {
     /* Wipe the Auth globals and Detach/Destruct component config + state. */
-    cfg->clean();
+    cfg->clear();
 
     /* remove our pointers to the probably-dead sub-configs */
     while (cfg->size()) {

diff --git a/src/ipc/Kids.cc b/src/ipc/Kids.cc
index 17c1465144cde3c84cb657c7aaaf42c49c61a3a9..ffb773a8c9733ed4b32ffce2d18e77b52c425598 100644 (file)
--- a/src/ipc/Kids.cc
+++ b/src/ipc/Kids.cc
@@ -19,8 +19,7 @@ Kids::Kids()
 /// maintain n kids
 void Kids::init()
 {
-    if (storage.size() > 0)
-        storage.clean();
+    storage.clear();
 
     storage.reserve(NumberOfKids());
 

diff --git a/src/tunnel.cc b/src/tunnel.cc
index 66c6b08b8cf89bc700aaa5b86080bb298ed33eca..22e8249883a75f8a3ba974903e8eb06f18a6c32c 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -238,7 +238,7 @@ TunnelStateData::~TunnelStateData()
     debugs(26, 3, "TunnelStateData destructed this=" << this);
     assert(noConnections());
     xfree(url);
-    serverDestinations.clean();
+    serverDestinations.clear();
     delete connectRespBuf;
 }