X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=e2d3f8dff24227d4635bc84ea9b2e129b3ef0487;hb=f9b4c280f8e7bec0c9237f9648c4fc5a77cfc468;hp=34a62d9189df79867d25c058f29667a63bd6d39f;hpb=45eff275cbc942a9b16f55367e6d5bd2bbfad2e0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 34a62d918..e2d3f8dff 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -1,16 +1,20 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018 Chris Novakovic <chrisnovakovic@users.noreply.github.com>
+ *   Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Adam <Adam@anope.org>
+ *   Copyright (C) 2012-2014, 2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 William Pitcock <nenolod@dereferenced.org>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2003-2008 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2008 Uli Schlachter <psychon@znc.in>
- *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006-2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007-2008, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Oliver Lupton <om@inspircd.org>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Burlex <???@???>
- *   Copyright (C) 2003 Craig McLure <craig@chatspike.net>
- *   Copyright (C) 2003 randomdan <???@???>
  *
  * 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
@@ -32,7 +36,6 @@
 #ifndef _WIN32
 	#include <unistd.h>
 	#include <sys/resource.h>
-	#include <dlfcn.h>
 	#include <getopt.h>
 	#include <pwd.h> // setuid
 	#include <grp.h> // setgid
@@ -132,15 +135,6 @@ namespace
 #endif
 	}
 
-	// Deletes a pointer and then zeroes it.
-	template<typename T>
-	void DeleteZero(T*& pr)
-	{
-		T* p = pr;
-		pr = NULL;
-		delete p;
-	}
-
 	// Drops to the unprivileged user/group specified in <security:runas{user,group}>.
 	void DropRoot()
 	{
@@ -419,9 +413,9 @@ void InspIRCd::Cleanup()
 		delete FakeClient->server;
 		FakeClient->cull();
 	}
-	DeleteZero(this->FakeClient);
-	DeleteZero(this->XLines);
-	DeleteZero(this->Config);
+	stdalgo::delete_zero(this->FakeClient);
+	stdalgo::delete_zero(this->XLines);
+	stdalgo::delete_zero(this->Config);
 	SocketEngine::Deinit();
 	Logs->CloseLogs();
 }