From: Francesco Chemolli Date: Sun, 2 Feb 2014 09:42:23 +0000 (+0100) Subject: Renamed Vector::clean to clear X-Git-Tag: SQUID_3_5_0_1~379^2~16 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c33a88cab48c882939146a518e94b1fc19a39c19;p=thirdparty%2Fsquid.git Renamed Vector::clean to clear --- diff --git a/src/ClientDelayConfig.cc b/src/ClientDelayConfig.cc index 0d95212f78..a588fd4aea 100644 --- 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 a8a459cd07..6e3a969e16 100644 --- 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 6847fed133..881cb94dad 100644 --- 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 206c4ad320..6e1810c350 100644 --- a/src/HttpHdrRange.cc +++ b/src/HttpHdrRange.cc @@ -341,7 +341,7 @@ void HttpHdrRange::merge (Vector &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 f54e9c228f..5a96f5a26e 100644 --- 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 ad84e0ea6b..4cb731347e 100644 --- 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 6edf828f16..f9e5ed0ce4 100644 --- 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 2794a4cdd2..d133c493e6 100644 --- 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 f5ebf4a3d7..5d06f78fdd 100644 --- 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 ad196bc1a9..28e7d83763 100644 --- 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 f31c9049cd..03c1c2e930 100644 --- 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 69b7669942..71c753890f 100644 --- 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::Vector() : capacity (0), count(0), items (NULL) template Vector::~Vector() { - clean(); + clear(); } template void -Vector::clean() +Vector::clear() { /* could also warn if some objects are left */ delete[] items; @@ -316,7 +316,7 @@ template Vector & Vector::operator = (Vector 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 d1e8e3eead..3bb3e7115c 100644 --- 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 17c1465144..ffb773a8c9 100644 --- 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 66c6b08b8c..22e8249883 100644 --- 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; }