kick_channel -> chanrec::KickUser(), server_kick_channel -> chanrec::ServerKickUser()

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

diff --git a/src/base.cpp b/src/base.cpp
index fc6e6583b9127be7432619ed42ff70773f91dc00..4612c4a595131d6dbecac4e0354da05d14d09cc0 100644 (file)
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -29,43 +29,27 @@ const int inverted_bitfields[]  =       {~1,~2,~4,~8,~16,~32,~64,~128};
 
 extern time_t TIME;
 
-bool Extensible::Extend(std::string key, char* p)
+bool Extensible::Shrink(const std::string &key)
 {
-       // only add an item if it doesnt already exist
-       if (this->Extension_Items.find(key) == this->Extension_Items.end())
+       /* map::size_type map::erase( const key_type& key );
+        * returns the number of elements removed, std::map
+        * is single-associative so this should only be 0 or 1
+        */
+       if(this->Extension_Items.erase(key))
        {
-               this->Extension_Items[key] = p;
-               log(DEBUG,"Extending object with item %s",key.c_str());
+               log(DEBUG, "Shrinking object with item %s",key.c_str());
                return true;
        }
-       // item already exists, return false
-       return false;
-}
-
-bool Extensible::Shrink(std::string key)
-{
-       // only attempt to remove a map item that exists
-       if (this->Extension_Items.find(key) != this->Extension_Items.end())
-       {
-               this->Extension_Items.erase(this->Extension_Items.find(key));
-               log(DEBUG,"Shrinking object with item %s",key.c_str());
-               return true;
-       }
-       return false;
-}
-
-char* Extensible::GetExt(std::string key)
-{
-       if (this->Extension_Items.find(key) != this->Extension_Items.end())
+       else
        {
-               return (this->Extension_Items.find(key))->second;
+               log(DEBUG, "Tried to shrink object with item %s but no items removed", key.c_str());            
+               return false;
        }
-       return NULL;
 }
 
 void Extensible::GetExtList(std::deque<std::string> &list)
 {
-       for (std::map<std::string,char*>::iterator u = Extension_Items.begin(); u != Extension_Items.end(); u++)
+       for (ExtensibleStore::iterator u = Extension_Items.begin(); u != Extension_Items.end(); u++)
        {
                list.push_back(u->first);
        }