X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fbase.cpp;h=a4c3e887e39bb13edde8d7a7a2b655e05f3bd94f;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=caa45c3b045e81de184eae45b7660ab7737088aa;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/base.cpp b/src/base.cpp
index caa45c3b0..a4c3e887e 100644
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -1,32 +1,40 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2004-2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd_config.h"
+
+#include "inspircd.h"
 #include "base.h"
 #include <time.h>
-#include "inspircd.h"
 #include <typeinfo>
 
 classbase::classbase()
 {
 	if (ServerInstance && ServerInstance->Logs)
-		ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::+ @%p", (void*)this);
+		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::+ @%p", (void*)this);
 }
 
 CullResult classbase::cull()
 {
 	if (ServerInstance && ServerInstance->Logs)
-		ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::-%s @%p",
+		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::-%s @%p",
 			typeid(*this).name(), (void*)this);
 	return CullResult();
 }
@@ -34,7 +42,7 @@ CullResult classbase::cull()
 classbase::~classbase()
 {
 	if (ServerInstance && ServerInstance->Logs)
-		ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::~ @%p", (void*)this);
+		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::~ @%p", (void*)this);
 }
 
 CullResult::CullResult()
@@ -66,14 +74,14 @@ refcountbase::refcountbase() : refcount(0)
 refcountbase::~refcountbase()
 {
 	if (refcount && ServerInstance && ServerInstance->Logs)
-		ServerInstance->Logs->Log("CULLLIST", DEBUG, "refcountbase::~ @%p with refcount %d",
+		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "refcountbase::~ @%p with refcount %d",
 			(void*)this, refcount);
 }
 
 usecountbase::~usecountbase()
 {
 	if (usecount && ServerInstance && ServerInstance->Logs)
-		ServerInstance->Logs->Log("CULLLIST", DEBUG, "usecountbase::~ @%p with refcount %d",
+		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "usecountbase::~ @%p with refcount %d",
 			(void*)this, usecount);
 }
 
@@ -124,9 +132,9 @@ void* ExtensionItem::unset_raw(Extensible* container)
 	return rv;
 }
 
-void ExtensionManager::Register(ExtensionItem* item)
+bool ExtensionManager::Register(ExtensionItem* item)
 {
-	types.insert(std::make_pair(item->name, item));
+	return types.insert(std::make_pair(item->name, item)).second;
 }
 
 void ExtensionManager::BeginUnregister(Module* module, std::vector<reference<ExtensionItem> >& list)
@@ -190,7 +198,7 @@ CullResult Extensible::cull()
 Extensible::~Extensible()
 {
 	if (!extensions.empty() && ServerInstance && ServerInstance->Logs)
-		ServerInstance->Logs->Log("CULLLIST", DEBUG,
+		ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG,
 			"Extensible destructor called without cull @%p", (void*)this);
 }