Improve escaping strings in the MySQL module.

[user/henk/code/inspircd.git] / src / base.cpp

diff --git a/src/base.cpp b/src/base.cpp
index 8cb336985ecd1608378df5a79d17dd0e2ee88a5f..ebd5214dbfee6d3738dfb6b31d15e68a3999f0fe 100644 (file)
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -284,24 +284,6 @@ void ExtensionItem::unserialize(SerializeFormat format, Extensible* container, c
        }
 }
 
-LocalExtItem::LocalExtItem(const std::string& Key, ExtensibleType exttype, Module* mod)
-       : ExtensionItem(Key, exttype, mod)
-{
-}
-
-LocalExtItem::~LocalExtItem()
-{
-}
-
-std::string LocalExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const
-{
-       return "";
-}
-
-void LocalExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
-{
-}
-
 LocalStringExt::LocalStringExt(const std::string& Key, ExtensibleType exttype, Module* Owner)
        : SimpleExtItem<std::string>(Key, exttype, Owner)
 {
@@ -311,21 +293,18 @@ LocalStringExt::~LocalStringExt()
 {
 }
 
-std::string LocalStringExt::serialize(SerializeFormat format, const Extensible* container, void* item) const
+std::string LocalStringExt::ToInternal(const Extensible* container, void* item) const
 {
-       if ((item) && (format != FORMAT_NETWORK))
-               return *static_cast<std::string*>(item);
-       return "";
+       return item ? *static_cast<std::string*>(item) : std::string(); 
 }
 
-void LocalStringExt::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+void LocalStringExt::FromInternal(Extensible* container, const std::string& value)
 {
-       if (format != FORMAT_NETWORK)
-               set(container, value);
+       set(container, value);
 }
 
 LocalIntExt::LocalIntExt(const std::string& Key, ExtensibleType exttype, Module* mod)
-       : LocalExtItem(Key, exttype, mod)
+       : ExtensionItem(Key, exttype, mod)
 {
 }
 
@@ -333,17 +312,14 @@ LocalIntExt::~LocalIntExt()
 {
 }
 
-std::string LocalIntExt::serialize(SerializeFormat format, const Extensible* container, void* item) const
+std::string LocalIntExt::ToInternal(const Extensible* container, void* item) const
 {
-       if (format == FORMAT_NETWORK)
-               return "";
        return ConvToStr(reinterpret_cast<intptr_t>(item));
 }
 
-void LocalIntExt::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+void LocalIntExt::FromInternal(Extensible* container, const std::string& value)
 {
-       if (format != FORMAT_NETWORK)
-               set(container, ConvToNum<intptr_t>(value));
+       set(container, ConvToNum<intptr_t>(value));
 }
 
 intptr_t LocalIntExt::get(const Extensible* container) const
@@ -377,12 +353,12 @@ std::string* StringExtItem::get(const Extensible* container) const
        return static_cast<std::string*>(get_raw(container));
 }
 
-std::string StringExtItem::serialize(SerializeFormat format, const Extensible* container, void* item) const
+std::string StringExtItem::ToNetwork(const Extensible* container, void* item) const
 {
-       return item ? *static_cast<std::string*>(item) : "";
+       return item ? *static_cast<std::string*>(item) : std::string();
 }
 
-void StringExtItem::unserialize(SerializeFormat format, Extensible* container, const std::string& value)
+void StringExtItem::FromNetwork(Extensible* container, const std::string& value)
 {
        if (value.empty())
                unset(container);
@@ -393,13 +369,13 @@ void StringExtItem::unserialize(SerializeFormat format, Extensible* container, c
 void StringExtItem::set(Extensible* container, const std::string& value)
 {
        void* old = set_raw(container, new std::string(value));
-       delete static_cast<std::string*>(old);
+       free(container, old);
 }
 
 void StringExtItem::unset(Extensible* container)
 {
        void* old = unset_raw(container);
-       delete static_cast<std::string*>(old);
+       free(container, old);
 }
 
 void StringExtItem::free(Extensible* container, void* item)