X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=b2101d574925173d4d3aecc15abbd4be15734521;hb=82243d9beb827fca5708efe9e047ff2fec4bfe8c;hp=69468f59c72e5c540d6fe245277df5058f9258c5;hpb=b64108b949c84da62e2c3e7eb2a862f58bcbcb22;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/base.cpp b/src/base.cpp
index 69468f59c..b2101d574 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -17,50 +17,31 @@
 #include "inspircd_config.h"
 #include "base.h"
 #include <time.h>
-#include <map>
-#include <string>
 #include "inspircd.h"
-#include "modules.h"
-#include "helperfuncs.h"
 
 const int bitfields[]           =       {1,2,4,8,16,32,64,128};
 const int inverted_bitfields[]  =       {~1,~2,~4,~8,~16,~32,~64,~128};
 
-extern time_t TIME;
-
-bool Extensible::Extend(std::string key, char* p)
+classbase::classbase()
 {
-	// only add an item if it doesnt already exist
-	if (this->Extension_Items.find(key) == this->Extension_Items.end())
-	{
-		this->Extension_Items[key] = p;
-		log(DEBUG,"Extending object with item %s",key.c_str());
-		return true;
-	}
-	// item already exists, return false
-	return false;
+	this->age = time(NULL);
 }
 
-bool Extensible::Shrink(std::string key)
+bool Extensible::Shrink(const 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;
+	/* 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
+	 */
+	return this->Extension_Items.erase(key);
 }
 
-char* Extensible::GetExt(std::string key)
+void Extensible::GetExtList(std::deque<std::string> &list)
 {
-	if (this->Extension_Items.find(key) != this->Extension_Items.end())
+	for (ExtensibleStore::iterator u = Extension_Items.begin(); u != Extension_Items.end(); u++)
 	{
-		return (this->Extension_Items.find(key))->second;
+		list.push_back(u->first);
 	}
-	log(DEBUG,"Cant find item %s",key.c_str());
-	return NULL;
 }
 
 void BoolSet::Set(int number)
@@ -112,6 +93,6 @@ BoolSet::BoolSet(char bitmask)
 
 bool BoolSet::operator=(BoolSet other)
 {
-        this->bits = other.bits;
-        return true;
+	this->bits = other.bits;
+	return true;
 }