diff options
| author |  Sadie Powell | 2019-08-13 16:05:57 +0100 |
|---|---|---|
| committer | Sadie Powell | 2019-08-13 16:59:04 +0100 |
| commit | b39bd5f49c7e09de9007af786d4f50f1b34dd435 (patch) | |
| tree | 7a12d116dd231d9fb83c3b632d312228ed0d49d6 /src/modules | |
| parent | Merge branch 'insp3' into master. (diff) | |
Rename ExtensionItem::free to ExtensionItem::Delete.
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/extra/m_geo_maxmind.cpp | 6 | ||||
| -rw-r--r-- | src/modules/m_callerid.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_monitor.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_sslinfo.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_topiclock.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/extra/m_geo_maxmind.cpp b/src/modules/extra/m_geo_maxmind.cpp index b0892f72a..8a96c6728 100644 --- a/src/modules/extra/m_geo_maxmind.cpp +++ b/src/modules/extra/m_geo_maxmind.cpp @@ -40,7 +40,7 @@ class GeolocationExtItem : public ExtensionItem { } - void free(Extensible* container, void* item) override + void Delete(Extensible* container, void* item) override { Geolocation::Location* old = static_cast<Geolocation::Location*>(item); if (old) @@ -55,12 +55,12 @@ class GeolocationExtItem : public ExtensionItem void set(Extensible* item, Geolocation::Location* value) { value->refcount_inc(); - free(item, set_raw(item, value)); + Delete(item, set_raw(item, value)); } void unset(Extensible* container) { - free(container, unset_raw(container)); + Delete(container, unset_raw(container)); } }; diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 0a2d7b3c4..7bffd7907 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -91,7 +91,7 @@ struct CallerIDExtInfo : public ExtensionItem { void* old = get_raw(container); if (old) - this->free(NULL, old); + this->Delete(NULL, old); callerid_data* dat = new callerid_data; set_raw(container, dat); @@ -125,7 +125,7 @@ struct CallerIDExtInfo : public ExtensionItem return dat; } - void free(Extensible* container, void* item) override + void Delete(Extensible* container, void* item) override { callerid_data* dat = static_cast<callerid_data*>(item); diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp index 88fcc906c..9c6195a88 100644 --- a/src/modules/m_monitor.cpp +++ b/src/modules/m_monitor.cpp @@ -79,7 +79,7 @@ class IRCv3::Monitor::Manager void unset(Extensible* container) { - free(container, unset_raw(container)); + Delete(container, unset_raw(container)); } std::string ToInternal(const Extensible* container, void* item) const override @@ -98,7 +98,7 @@ class IRCv3::Monitor::Manager void FromInternal(Extensible* container, const std::string& value) override; - void free(Extensible* container, void* item) override + void Delete(Extensible* container, void* item) override { delete static_cast<ExtData*>(item); } diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp index 702d486c8..891b95460 100644 --- a/src/modules/m_sslinfo.cpp +++ b/src/modules/m_sslinfo.cpp @@ -55,7 +55,7 @@ class SSLCertExt : public ExtensionItem void unset(Extensible* container) { - free(container, unset_raw(container)); + Delete(container, unset_raw(container)); } std::string ToNetwork(const Extensible* container, void* item) const override @@ -88,7 +88,7 @@ class SSLCertExt : public ExtensionItem } } - void free(Extensible* container, void* item) override + void Delete(Extensible* container, void* item) override { ssl_cert* old = static_cast<ssl_cert*>(item); if (old && old->refcount_dec()) diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp index 877123748..a95970788 100644 --- a/src/modules/m_topiclock.cpp +++ b/src/modules/m_topiclock.cpp @@ -119,7 +119,7 @@ class FlagExtItem : public ExtensionItem unset_raw(container); } - void free(Extensible* container, void* item) override + void Delete(Extensible* container, void* item) override { // nothing to free } |