Fix various cases of the &* being next to the name instead of type.

78 files changed, 188 insertions, 188 deletions

diff --git a/src/bancache.cpp b/src/bancache.cpp
index a79c94544..3255644cc 100644
--- a/src/bancache.cpp
+++ b/src/bancache.cpp
@@ -31,7 +31,7 @@ BanCacheHit::BanCacheHit(const std::string& type, const std::string& reason, tim
 {
 }
 
-BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &type, const std::string &reason, time_t seconds)
+BanCacheHit* BanCacheManager::AddHit(const std::string& ip, const std::string& type, const std::string& reason, time_t seconds)
 {
 	BanCacheHit*& b = BanHash[ip];
 	if (b != nullptr) // can't have two cache entries on the same IP, sorry..
@@ -41,7 +41,7 @@ BanCacheHit *BanCacheManager::AddHit(const std::string &ip, const std::string &t
 	return b;
 }
 
-BanCacheHit *BanCacheManager::GetHit(const std::string &ip)
+BanCacheHit* BanCacheManager::GetHit(const std::string& ip)
 {
 	BanCacheHash::iterator i = this->BanHash.find(ip);
 
diff --git a/src/channels.cpp b/src/channels.cpp
index 85925a2e8..fa4e096ee 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -40,7 +40,7 @@ namespace
 	ChanModeReference ban(nullptr, "ban");
 }
 
-Channel::Channel(const std::string &cname, time_t ts)
+Channel::Channel(const std::string& cname, time_t ts)
 	: Extensible(ExtensionType::CHANNEL)
 	, name(cname)
 	, age(ts)
diff --git a/src/cidr.cpp b/src/cidr.cpp
index f7401fe92..75d8326e2 100644
--- a/src/cidr.cpp
+++ b/src/cidr.cpp
@@ -30,7 +30,7 @@
  * This will also attempt to match any leading usernames or nicknames on the mask, using
  * match(), when match_with_username is true.
  */
-bool irc::sockets::MatchCIDR(const std::string &address, const std::string &cidr_mask, bool match_with_username)
+bool irc::sockets::MatchCIDR(const std::string& address, const std::string& cidr_mask, bool match_with_username)
 {
 	std::string address_copy;
 	std::string cidr_copy;
diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 7f1ddf177..79b9bdaa5 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -110,7 +110,7 @@ bool CommandParser::LoopCall(User* user, Command* handler, const CommandBase::Pa
 	return true;
 }
 
-Command* CommandParser::GetHandler(const std::string &commandname)
+Command* CommandParser::GetHandler(const std::string& commandname)
 {
 	CommandMap::iterator n = cmdlist.find(commandname);
 	if (n != cmdlist.end())
diff --git a/src/configparser.cpp b/src/configparser.cpp
index af05e8d86..8afc20856 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -717,7 +717,7 @@ bool ConfigTag::getBool(const std::string& key, bool def) const
 	return def;
 }
 
-unsigned char ConfigTag::getCharacter(const std::string &key, unsigned char def) const
+unsigned char ConfigTag::getCharacter(const std::string& key, unsigned char def) const
 {
 	std::string result;
 	if (!readString(key, result) || result.size() != 1)
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 1c8a181ca..718488115 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -367,7 +367,7 @@ void ServerConfig::Read()
 	}
 }
 
-void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
+void ServerConfig::Apply(ServerConfig* old, const std::string& useruid)
 {
 	valid = true;
 	if (old)
@@ -411,7 +411,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
 		CrossCheckOperClassType();
 		CrossCheckConnectBlocks(old);
 	}
-	catch (CoreException &ce)
+	catch (CoreException& ce)
 	{
 		errstr << ce.GetReason() << std::endl;
 	}
diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp
index a3018ac75..a9732ace1 100644
--- a/src/coremods/core_dns.cpp
+++ b/src/coremods/core_dns.cpp
@@ -205,7 +205,7 @@ private:
 				if (pos + rdlength > input_size)
 					throw Exception(creator, "Unable to unpack TXT resource record");
 
-				record.rdata = std::string(reinterpret_cast<const char *>(input + pos), rdlength);
+				record.rdata = std::string(reinterpret_cast<const char* >(input + pos), rdlength);
 				pos += rdlength;
 
 				if (record.rdata.find_first_of("\r\n\0", 0, 3) != std::string::npos)
diff --git a/src/coremods/core_user/cmd_userhost.cpp b/src/coremods/core_user/cmd_userhost.cpp
index 0ebc6d635..2152c47cc 100644
--- a/src/coremods/core_user/cmd_userhost.cpp
+++ b/src/coremods/core_user/cmd_userhost.cpp
@@ -41,7 +41,7 @@ CmdResult CommandUserhost::Handle(User* user, const Params& parameters)
 	size_t paramcount = std::min<size_t>(parameters.size(), 5);
 	for (size_t i = 0; i < paramcount; ++i)
 	{
-		User *u = ServerInstance->Users.FindNick(parameters[i]);
+		User* u = ServerInstance->Users.FindNick(parameters[i]);
 
 		if ((u) && (u->registered == REG_ALL))
 		{
diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index 25c4b57a6..4c4e71544 100644
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -279,7 +279,7 @@ CmdResult CommandWhois::HandleRemote(RemoteUser* target, const Params& parameter
 
 CmdResult CommandWhois::HandleLocal(LocalUser* user, const Params& parameters)
 {
-	User *dest;
+	User* dest;
 	unsigned int userindex = 0;
 	unsigned long idle = 0;
 	time_t signon = 0;
diff --git a/src/coremods/core_xline/cmd_zline.cpp b/src/coremods/core_xline/cmd_zline.cpp
index d4be7e497..65e3965c5 100644
--- a/src/coremods/core_xline/cmd_zline.cpp
+++ b/src/coremods/core_xline/cmd_zline.cpp
@@ -50,7 +50,7 @@ CmdResult CommandZline::Handle(User* user, const Params& parameters)
 			return CmdResult::FAILURE;
 		}
 
-		User *u = ServerInstance->Users.Find(target);
+		User* u = ServerInstance->Users.Find(target);
 
 		if ((u) && (u->registered == REG_ALL))
 		{
diff --git a/src/hashcomp.cpp b/src/hashcomp.cpp
index 03ba05103..9225374f4 100644
--- a/src/hashcomp.cpp
+++ b/src/hashcomp.cpp
@@ -154,7 +154,7 @@ bool irc::insensitive_swo::operator()(const std::string& a, const std::string& b
 	return (asize < bsize);
 }
 
-size_t irc::insensitive::operator()(const std::string &s) const
+size_t irc::insensitive::operator()(const std::string& s) const
 {
 	/* XXX: NO DATA COPIES! :)
 	 * The hash function here is practically
@@ -224,7 +224,7 @@ irc::sepstream::sepstream(const std::string& source, char separator, bool allowe
 {
 }
 
-bool irc::sepstream::GetToken(std::string &token)
+bool irc::sepstream::GetToken(std::string& token)
 {
 	if (this->StreamEnd())
 	{
@@ -273,7 +273,7 @@ bool irc::sepstream::Contains(const std::string& value)
 	return false;
 }
 
-irc::portparser::portparser(const std::string &source, bool allow_overlapped)
+irc::portparser::portparser(const std::string& source, bool allow_overlapped)
 	: sep(source), in_range(0), range_begin(0), range_end(0), overlapped(allow_overlapped)
 {
 }
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 236f2e9de..1dbc62cb9 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -36,7 +36,7 @@
 #include "inspircd.h"
 #include "xline.h"
 
-bool InspIRCd::IsValidMask(const std::string &mask)
+bool InspIRCd::IsValidMask(const std::string& mask)
 {
 	const char* dest = mask.c_str();
 	int exclamation = 0;
@@ -71,7 +71,7 @@ bool InspIRCd::IsValidMask(const std::string &mask)
 	return true;
 }
 
-void InspIRCd::StripColor(std::string &sentence)
+void InspIRCd::StripColor(std::string& sentence)
 {
 	/* refactor this completely due to SQUIT bug since the old code would strip last char and replace with \0 --peavey */
 	int seq = 0;
@@ -263,7 +263,7 @@ bool InspIRCd::IsHost(const std::string& host)
 	return numdots;
 }
 
-bool InspIRCd::IsSID(const std::string &str)
+bool InspIRCd::IsSID(const std::string& str)
 {
 	/* Returns true if the string given is exactly 3 characters long,
 	 * starts with a digit, and the other two characters are A-Z or digits
diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index acf2816e2..fcb1c9d8a 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -359,7 +359,7 @@ void StreamSocket::FlushSendQ(SendQueue& sq)
 		}
 }
 
-void StreamSocket::WriteData(const std::string &data)
+void StreamSocket::WriteData(const std::string& data)
 {
 	if (!HasFd())
 	{
diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 3a69b84ed..4c1791228 100644
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -66,7 +66,7 @@ ListenSocket::ListenSocket(std::shared_ptr<ConfigTag> tag, const irc::sockets::s
 		/* This must be >= sizeof(DWORD) on Windows */
 		const int enable = (addr.empty() || addr == "*") ? 0 : 1;
 		/* This must be before bind() */
-		setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<const char *>(&enable), sizeof(enable));
+		setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<const char* >(&enable), sizeof(enable));
 		// errors ignored intentionally
 	}
 #endif
diff --git a/src/mode.cpp b/src/mode.cpp
index 5eca116cb..af76847ef 100644
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -347,7 +347,7 @@ void ModeParser::ModeParamsToChangeList(User* user, ModeType type, const std::ve
 			continue;
 		}
 
-		ModeHandler *mh = this->FindMode(modechar, type);
+		ModeHandler* mh = this->FindMode(modechar, type);
 		if (!mh)
 		{
 			/* No mode handler? Unknown mode character then. */
@@ -506,7 +506,7 @@ void ModeParser::ShowListModeList(User* user, Channel* chan, ModeHandler* mh)
 	}
 }
 
-void ModeParser::CleanMask(std::string &mask)
+void ModeParser::CleanMask(std::string& mask)
 {
 	auto pos_of_pling    = mask.find_first_of('!');
 	auto pos_of_at       = mask.find_first_of('@',  pos_of_pling == std::string::npos ? 0 : pos_of_pling);
diff --git a/src/modules.cpp b/src/modules.cpp
index 80878a55f..51ffa208b 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -94,7 +94,7 @@ void Module::DetachEvent(Implementation i)
 void		Module::GetLinkData(LinkData&, std::string&) { }
 void		Module::Prioritize() { }
 void		Module::ReadConfig(ConfigStatus& status) { }
-ModResult	Module::OnSendSnotice(char &snomask, std::string &type, const std::string &message) { DetachEvent(I_OnSendSnotice); return MOD_RES_PASSTHRU; }
+ModResult	Module::OnSendSnotice(char& snomask, std::string& type, const std::string& message) { DetachEvent(I_OnSendSnotice); return MOD_RES_PASSTHRU; }
 void		Module::OnUserConnect(LocalUser*) { DetachEvent(I_OnUserConnect); }
 ModResult	Module::OnUserPreQuit(LocalUser*, std::string&, std::string&) { DetachEvent(I_OnUserPreQuit); return MOD_RES_PASSTHRU; }
 void		Module::OnUserQuit(User*, const std::string&, const std::string&) { DetachEvent(I_OnUserQuit); }
@@ -136,7 +136,7 @@ ModResult	Module::OnCheckBan(User*, Channel*, const std::string&) { DetachEvent(
 ModResult	Module::OnPreChangeHost(LocalUser*, const std::string&) { DetachEvent(I_OnPreChangeHost); return MOD_RES_PASSTHRU; }
 ModResult	Module::OnPreChangeRealName(LocalUser*, const std::string&) { DetachEvent(I_OnPreChangeRealName); return MOD_RES_PASSTHRU; }
 ModResult	Module::OnPreTopicChange(User*, Channel*, const std::string&) { DetachEvent(I_OnPreTopicChange); return MOD_RES_PASSTHRU; }
-ModResult	Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { DetachEvent(I_OnPassCompare); return MOD_RES_PASSTHRU; }
+ModResult	Module::OnPassCompare(Extensible* ex, const std::string& password, const std::string& input, const std::string& hashtype) { DetachEvent(I_OnPassCompare); return MOD_RES_PASSTHRU; }
 void		Module::OnPostConnect(User*) { DetachEvent(I_OnPostConnect); }
 void		Module::OnUserPostMessage(User*, const MessageTarget&, const MessageDetails&) { DetachEvent(I_OnUserPostMessage); }
 void		Module::OnUserMessageBlocked(User*, const MessageTarget&, const MessageDetails&) { DetachEvent(I_OnUserMessageBlocked); }
@@ -729,7 +729,7 @@ void dynamic_reference_base::resolve()
 		value = nullptr;
 }
 
-Module* ModuleManager::Find(const std::string &name)
+Module* ModuleManager::Find(const std::string& name)
 {
 	std::map<std::string, Module*>::const_iterator modfind = Modules.find(ExpandModName(name));
 
diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp
index e72acc8ca..3d5e97a09 100644
--- a/src/modules/extra/m_ldap.cpp
+++ b/src/modules/extra/m_ldap.cpp
@@ -533,7 +533,7 @@ private:
 				{
 					Reconnect();
 				}
-				catch (const LDAPException &)
+				catch (const LDAPException&)
 				{
 				}
 
diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 1e6ae751c..980ccd627 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -417,7 +417,7 @@ restart:
 		}
 	}
 
-	void Submit(SQL::Query *req, const std::string& q) override
+	void Submit(SQL::Query* req, const std::string& q) override
 	{
 		ServerInstance->Logs.Debug(MODNAME, "Executing PostgreSQL query: " + q);
 		if (qinprog.q.empty())
@@ -431,7 +431,7 @@ restart:
 		}
 	}
 
-	void Submit(SQL::Query *req, const std::string& q, const SQL::ParamList& p) override
+	void Submit(SQL::Query* req, const std::string& q, const SQL::ParamList& p) override
 	{
 		std::string res;
 		unsigned int param = 0;
@@ -456,7 +456,7 @@ restart:
 		Submit(req, res);
 	}
 
-	void Submit(SQL::Query *req, const std::string& q, const SQL::ParamMap& p) override
+	void Submit(SQL::Query* req, const std::string& q, const SQL::ParamMap& p) override
 	{
 		std::string res;
 		for(std::string::size_type i = 0; i < q.length(); i++)
diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index d5b780996..7989c5230 100644
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -127,7 +127,7 @@ public:
 	void Query(SQL::Query* query, const std::string& q)
 	{
 		SQLite3Result res;
-		sqlite3_stmt *stmt;
+		sqlite3_stmt* stmt;
 		int err = sqlite3_prepare_v2(conn, q.c_str(), static_cast<int>(q.length()), &stmt, nullptr);
 		if (err != SQLITE_OK)
 		{
diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index aa3879295..1c148b36c 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -1127,7 +1127,7 @@ public:
 			ReadProfiles();
 	}
 
-	void OnModuleRehash(User* user, const std::string &param) override
+	void OnModuleRehash(User* user, const std::string& param) override
 	{
 		if (!irc::equals(param, "tls") && !irc::equals(param, "ssl"))
 			return;
diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp
index de94acb4c..b3f48cd94 100644
--- a/src/modules/extra/m_ssl_mbedtls.cpp
+++ b/src/modules/extra/m_ssl_mbedtls.cpp
@@ -958,7 +958,7 @@ public:
 			ReadProfiles();
 	}
 
-	void OnModuleRehash(User* user, const std::string &param) override
+	void OnModuleRehash(User* user, const std::string& param) override
 	{
 		if (!irc::equals(param, "tls") && !irc::equals(param, "ssl"))
 			return;
diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index d418fbb92..7b73ee435 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -489,7 +489,7 @@ namespace OpenSSL
 
 static BIO_METHOD* biomethods;
 
-static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx)
+static int OnVerify(int preverify_ok, X509_STORE_CTX* ctx)
 {
 	/* XXX: This will allow self signed certificates.
 	 * In the future if we want an option to not allow this,
@@ -1006,7 +1006,7 @@ public:
 			ReadProfiles();
 	}
 
-	void OnModuleRehash(User* user, const std::string &param) override
+	void OnModuleRehash(User* user, const std::string& param) override
 	{
 		if (!irc::equals(param, "tls") && !irc::equals(param, "ssl"))
 			return;
diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index ea8be2c41..f3bd96700 100644
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -119,7 +119,7 @@ public:
 	{
 	}
 
-	static std::string GetVar(std::string varname, const std::string &original_line)
+	static std::string GetVar(std::string varname, const std::string& original_line)
 	{
 		irc::spacesepstream ss(original_line);
 		varname.erase(varname.begin());
@@ -225,7 +225,7 @@ public:
 			return;
 		}
 
-		Channel *c = target.Get<Channel>();
+		Channel* c = target.Get<Channel>();
 		std::string scommand;
 
 		// text is like "!moo cows bite me", we want "!moo" first
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 566171fe5..83c959895 100644
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -146,12 +146,12 @@ public:
 		}
 	}
 
-	void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) override
+	void OnUserPart(Membership* memb, std::string& partmessage, CUList& excepts) override
 	{
 		BuildExcept(memb, excepts);
 	}
 
-	void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) override
+	void OnUserKick(User* source, Membership* memb, const std::string& reason, CUList& excepts) override
 	{
 		BuildExcept(memb, excepts);
 	}
diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp
index dc03eddb2..216130ab5 100644
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -95,7 +95,7 @@ public:
 	{
 	}
 
-	void OnPostJoin(Membership *memb) override
+	void OnPostJoin(Membership* memb) override
 	{
 		if (!IS_LOCAL(memb->user))
 			return;
diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index b0b1064b5..dc45aff03 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -41,7 +41,7 @@ public:
 	std::string targetchan;
 	std::string banmask;
 
-	BanRedirectEntry(const std::string &target = "", const std::string &mask = "")
+	BanRedirectEntry(const std::string& target = "", const std::string& mask = "")
 	: targetchan(target), banmask(mask)
 	{
 	}
diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 3503b3554..04e5c54c6 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -113,7 +113,7 @@ struct CallerIDExtInfo final
 
 		while (s.GetToken(tok))
 		{
-			User *u = ServerInstance->Users.Find(tok);
+			User* u = ServerInstance->Users.Find(tok);
 			if ((u) && (u->registered == REG_ALL) && (!u->quitting))
 			{
 				if (dat->accepting.insert(u).second)
@@ -317,7 +317,7 @@ public:
 		}
 
 		// Look up their list to remove me.
-		callerid_data *dat2 = extInfo.Get(whotoremove, false);
+		callerid_data* dat2 = extInfo.Get(whotoremove, false);
 		if (!dat2)
 		{
 			// How the fuck is this possible.
@@ -373,7 +373,7 @@ private:
 	void RemoveFromAllAccepts(User* who)
 	{
 		// First, find the list of people who have me on accept
-		callerid_data *userdata = cmd.extInfo.Get(who, false);
+		callerid_data* userdata = cmd.extInfo.Get(who, false);
 		if (!userdata)
 			return;
 
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 5fbf16d1f..437cef2b5 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -127,7 +127,7 @@ public:
 				return CmdResult::FAILURE;
 			}
 
-			const char *reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied";
+			const char* reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied";
 			auto r = new CBan(ServerInstance->Time(), duration, user->nick, reason, parameters[0]);
 			if (ServerInstance->XLines->AddLine(r, user))
 			{
@@ -193,7 +193,7 @@ public:
 		if (override)
 			return MOD_RES_PASSTHRU;
 
-		XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname);
+		XLine* rl = ServerInstance->XLines->MatchesLine("CBAN", cname);
 		if (rl)
 		{
 			// Channel is banned.
diff --git a/src/modules/m_chanlog.cpp b/src/modules/m_chanlog.cpp
index ae274e691..9df0ba075 100644
--- a/src/modules/m_chanlog.cpp
+++ b/src/modules/m_chanlog.cpp
@@ -65,7 +65,7 @@ public:
 		logstreams.swap(newlogs);
 	}
 
-	ModResult OnSendSnotice(char &sno, std::string &desc, const std::string &msg) override
+	ModResult OnSendSnotice(char& sno, std::string& desc, const std::string& msg) override
 	{
 		auto channels = insp::equal_range(logstreams, sno);
 		if (channels.empty())
diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index b12ce085e..650017b26 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -129,7 +129,7 @@ public:
 		ValidateChans();
 	}
 
-	void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except_list) override
+	void OnUserKick(User* source, Membership* memb, const std::string& reason, CUList& except_list) override
 	{
 		if (badchan)
 		{
diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index c436f5b7d..057761374 100644
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -234,7 +234,7 @@ public:
 			}
 
 			std::string nick(parameters[0], 1);
-			User *target = ServerInstance->Users.FindNick(nick);
+			User* target = ServerInstance->Users.FindNick(nick);
 
 			if ((target) && (!target->quitting) && (target->registered == REG_ALL))
 			{
@@ -393,7 +393,7 @@ public:
 	{
 	}
 
-	void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) override
+	void OnUserQuit(User* user, const std::string& reason, const std::string& oper_message) override
 	{
 		dccallowlist* udl = ext.Get(user);
 
@@ -406,7 +406,7 @@ public:
 		RemoveNick(user);
 	}
 
-	void OnUserPostNick(User* user, const std::string &oldnick) override
+	void OnUserPostNick(User* user, const std::string& oldnick) override
 	{
 		RemoveNick(user);
 	}
@@ -555,7 +555,7 @@ public:
 		/* Iterate through all DCCALLOW lists and remove user */
 		for (userlist::iterator iter = ul.begin(); iter != ul.end();)
 		{
-			User *u = (User*)(*iter);
+			User* u = (User*)(*iter);
 			dl = ext.Get(u);
 			if (dl)
 			{
@@ -582,7 +582,7 @@ public:
 		}
 	}
 
-	static void RemoveFromUserlist(User *user)
+	static void RemoveFromUserlist(User* user)
 	{
 		// remove user from userlist
 		for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 553ae01ee..f28dccec8 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -139,8 +139,8 @@ public:
 	ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) override;
 	void OnUserJoin(Membership*, bool, bool, CUList&) override;
 	void CleanUser(User* user);
-	void OnUserPart(Membership*, std::string &partmessage, CUList&) override;
-	void OnUserKick(User* source, Membership*, const std::string &reason, CUList&) override;
+	void OnUserPart(Membership*, std::string& partmessage, CUList&) override;
+	void OnUserKick(User* source, Membership*, const std::string& reason, CUList&) override;
 	void OnBuildNeighborList(User* source, IncludeChanList& include, std::map<User*, bool>& exception) override;
 	void OnUserMessage(User* user, const MessageTarget& target, const MessageDetails& details) override;
 	void OnUserTagMessage(User* user, const MessageTarget& target, const CTCTags::TagMessageDetails& details) override;
@@ -183,12 +183,12 @@ void ModuleDelayJoin::OnUserJoin(Membership* memb, bool sync, bool created, CULi
 		unjoined.Set(memb, ServerInstance->Time());
 }
 
-void ModuleDelayJoin::OnUserPart(Membership* memb, std::string &partmessage, CUList& except)
+void ModuleDelayJoin::OnUserPart(Membership* memb, std::string& partmessage, CUList& except)
 {
 	PopulateExcepts(except, memb);
 }
 
-void ModuleDelayJoin::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& except)
+void ModuleDelayJoin::OnUserKick(User* source, Membership* memb, const std::string& reason, CUList& except)
 {
 	PopulateExcepts(except, memb);
 }
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index d1e55238f..fd72c7e52 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -190,7 +190,7 @@ private:
 	}
 
 public:
-	DNSBLResolver(DNS::Manager *mgr, Module *me, StringExtItem& match, IntExtItem& ctr, const std::string &hostname, LocalUser* u, std::shared_ptr<DNSBLEntry> conf)
+	DNSBLResolver(DNS::Manager* mgr, Module* me, StringExtItem& match, IntExtItem& ctr, const std::string& hostname, LocalUser* u, std::shared_ptr<DNSBLEntry> conf)
 		: DNS::Request(mgr, me, hostname, DNS::QUERY_A, true, conf->timeout)
 		, theirsa(u->client_sa)
 		, theiruid(u->uuid)
@@ -201,7 +201,7 @@ public:
 	}
 
 	/* Note: This may be called multiple times for multiple A record results */
-	void OnLookupComplete(const DNS::Query *r) override
+	void OnLookupComplete(const DNS::Query* r) override
 	{
 		/* Check the user still exists */
 		LocalUser* them = IS_LOCAL(ServerInstance->Users.FindUUID(theiruid));
@@ -320,7 +320,7 @@ public:
 			ConfEntry->stats_misses++;
 	}
 
-	void OnError(const DNS::Query *q) override
+	void OnError(const DNS::Query* q) override
 	{
 		bool is_miss = true;
 		switch (q->error)
@@ -444,7 +444,7 @@ public:
 			std::string hostname = reversedip + "." + dnsbl->domain;
 
 			/* now we'd need to fire off lookups for `hostname'. */
-			DNSBLResolver *r = new DNSBLResolver(*this->DNS, this, nameExt, countExt, hostname, user, dnsbl);
+			DNSBLResolver* r = new DNSBLResolver(*this->DNS, this, nameExt, countExt, hostname, user, dnsbl);
 			try
 			{
 				this->DNS->Process(r);
@@ -484,7 +484,7 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnCheckReady(LocalUser *user) override
+	ModResult OnCheckReady(LocalUser* user) override
 	{
 		if (countExt.Get(user))
 			return MOD_RES_DENY;
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index a0eb3f4ab..cfd00ff47 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -224,15 +224,15 @@ public:
 	void init() override;
 	Cullable::Result Cull() override;
 	ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override;
-	const FilterResult* FilterMatch(User* user, const std::string &text, int flags);
+	const FilterResult* FilterMatch(User* user, const std::string& text, int flags);
 	bool DeleteFilter(const std::string& freeform, std::string& reason);
 	std::pair<bool, std::string> AddFilter(const std::string& freeform, FilterAction type, const std::string& reason, unsigned long duration, const std::string& flags, bool config = false);
 	void ReadConfig(ConfigStatus& status) override;
 	void GetLinkData(LinkData& data, std::string& compatdata) override;
 	static std::string EncodeFilter(const FilterResult& filter);
-	FilterResult DecodeFilter(const std::string &data);
+	FilterResult DecodeFilter(const std::string& data);
 	void OnSyncNetwork(ProtocolInterface::Server& server) override;
-	void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata) override;
+	void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string& extdata) override;
 	ModResult OnStats(Stats::Context& stats) override;
 	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) override;
 	void OnUnloadModule(Module* mod) override;
@@ -698,7 +698,7 @@ std::string ModuleFilter::EncodeFilter(const FilterResult& filter)
 	return stream.str();
 }
 
-FilterResult ModuleFilter::DecodeFilter(const std::string &data)
+FilterResult ModuleFilter::DecodeFilter(const std::string& data)
 {
 	std::string filteraction;
 	FilterResult res;
@@ -740,7 +740,7 @@ void ModuleFilter::OnSyncNetwork(ProtocolInterface::Server& server)
 	}
 }
 
-void ModuleFilter::OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata)
+void ModuleFilter::OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string& extdata)
 {
 	if (!target && irc::equals(extname, "filter"))
 	{
@@ -756,7 +756,7 @@ void ModuleFilter::OnDecodeMetaData(Extensible* target, const std::string &extna
 	}
 }
 
-const FilterResult* ModuleFilter::FilterMatch(User* user, const std::string &text, int flgs)
+const FilterResult* ModuleFilter::FilterMatch(User* user, const std::string& text, int flgs)
 {
 	static std::string stripped_text;
 	stripped_text.clear();
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index d0a6ae46f..d6badd10f 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -266,7 +266,7 @@ public:
 		Page(data, response, &empty);
 	}
 
-	void SendHeaders(unsigned long size, unsigned int response, HTTPHeaders &rheaders)
+	void SendHeaders(unsigned long size, unsigned int response, HTTPHeaders& rheaders)
 	{
 		WriteData(InspIRCd::Format("HTTP/%u.%u %u %s\r\n", parser.http_major ? parser.http_major : 1, parser.http_major ? parser.http_minor : 1, response, http_status_str((http_status)response)));
 
diff --git a/src/modules/m_httpd_acl.cpp b/src/modules/m_httpd_acl.cpp
index 66f6f8bb2..931a489e1 100644
--- a/src/modules/m_httpd_acl.cpp
+++ b/src/modules/m_httpd_acl.cpp
@@ -35,8 +35,8 @@ public:
 	std::string whitelist;
 	std::string blacklist;
 
-	HTTPACL(const std::string &set_path, const std::string &set_username, const std::string &set_password,
-		const std::string &set_whitelist, const std::string &set_blacklist)
+	HTTPACL(const std::string& set_path, const std::string& set_username, const std::string& set_password,
+		const std::string& set_whitelist, const std::string& set_blacklist)
 		: path(set_path), username(set_username), password(set_password), whitelist(set_whitelist),
 		blacklist(set_blacklist) { }
 };
@@ -100,7 +100,7 @@ public:
 		acl_list.swap(new_acls);
 	}
 
-	void BlockAccess(HTTPRequest* http, unsigned int returnval, const std::string &extraheaderkey = "", const std::string &extraheaderval="")
+	void BlockAccess(HTTPRequest* http, unsigned int returnval, const std::string& extraheaderkey = "", const std::string& extraheaderval="")
 	{
 		ServerInstance->Logs.Debug(MODNAME, "BlockAccess (%u)", returnval);
 
diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index b923e6371..36f9ceed0 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -104,7 +104,7 @@ class IdentRequestSocket final
 	: public EventHandler
 {
 public:
-	LocalUser *user;			/* User we are attached to */
+	LocalUser* user;			/* User we are attached to */
 	std::string result;		/* Holds the ident string if done */
 	time_t age;
 	bool done;			/* True if lookup is finished */
@@ -354,7 +354,7 @@ public:
 	 * creating a Timer object and especially better than creating a
 	 * Timer per ident lookup!
 	 */
-	ModResult OnCheckReady(LocalUser *user) override
+	ModResult OnCheckReady(LocalUser* user) override
 	{
 		/* Does user have an ident socket attached at all? */
 		IdentRequestSocket* isock = socket.Get(user);
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 4aca441e1..7f55d21aa 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -168,7 +168,7 @@ public:
 	{
 		if (!override && chan)
 		{
-			joinfloodsettings *f = jf.ext.Get(chan);
+			joinfloodsettings* f = jf.ext.Get(chan);
 			if (f && f->islocked())
 			{
 				user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, "This channel is temporarily unavailable (+j is set). Please try again later.");
@@ -184,7 +184,7 @@ public:
 		if (sync || ignoreuntil > ServerInstance->Time())
 			return;
 
-		joinfloodsettings *f = jf.ext.Get(memb->chan);
+		joinfloodsettings* f = jf.ext.Get(memb->chan);
 
 		/* But all others are OK */
 		if ((f) && (!f->islocked()))
diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 65ea91a34..90ffd4243 100644
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -148,7 +148,7 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) override
+	void OnUserKick(User* source, Membership* memb, const std::string& reason, CUList& excepts) override
 	{
 		if ((!IS_LOCAL(memb->user)) || (source == memb->user))
 			return;
diff --git a/src/modules/m_ldapauth.cpp b/src/modules/m_ldapauth.cpp
index 47e3098ca..accd43412 100644
--- a/src/modules/m_ldapauth.cpp
+++ b/src/modules/m_ldapauth.cpp
@@ -364,7 +364,7 @@ public:
 		}
 	}
 
-	void OnUserConnect(LocalUser *user) override
+	void OnUserConnect(LocalUser* user) override
 	{
 		std::string* cc = ldapVhost.Get(user);
 		if (cc)
diff --git a/src/modules/m_ldapoper.cpp b/src/modules/m_ldapoper.cpp
index ef48d26e1..3aa8dfffb 100644
--- a/src/modules/m_ldapoper.cpp
+++ b/src/modules/m_ldapoper.cpp
@@ -128,7 +128,7 @@ class SearchInterface final
 	}
 
 public:
-	SearchInterface(Module* mod, const std::string& prov, const std::string &uuid, const std::string& oper, const std::string& pass)
+	SearchInterface(Module* mod, const std::string& prov, const std::string& uuid, const std::string& oper, const std::string& pass)
 		: LDAPOperBase(mod, uuid, oper, pass)
 		, provider(prov)
 	{
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 18eb477c6..5e3f09939 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -156,7 +156,7 @@ public:
 		if (res == MOD_RES_ALLOW)
 			return MOD_RES_PASSTHRU;
 
-		floodsettings *f = mf.ext.Get(dest);
+		floodsettings* f = mf.ext.Get(dest);
 		if (f)
 		{
 			if (f->addmessage(user, weight))
diff --git a/src/modules/m_mlock.cpp b/src/modules/m_mlock.cpp
index 5c8f59255..6f63763b6 100644
--- a/src/modules/m_mlock.cpp
+++ b/src/modules/m_mlock.cpp
@@ -48,7 +48,7 @@ public:
 		if (!IS_LOCAL(source))
 			return MOD_RES_PASSTHRU;
 
-		std::string *mlock_str = mlock.Get(channel);
+		std::string* mlock_str = mlock.Get(channel);
 		if (!mlock_str)
 			return MOD_RES_PASSTHRU;
 
diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index 9e13975d1..c671baf85 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -149,7 +149,7 @@ public:
 	{
 		for (const auto* memb : user->chans)
 		{
-			nickfloodsettings *f = nf.ext.Get(memb->chan);
+			nickfloodsettings* f = nf.ext.Get(memb->chan);
 			if (f)
 			{
 				ModResult res = CheckExemption::Call(exemptionprov, user, memb->chan, "nickflood");
@@ -180,14 +180,14 @@ public:
 	/*
 	 * XXX: HACK: We do the increment on the *POST* event here (instead of all together) because we have no way of knowing whether other modules would block a nickchange.
 	 */
-	void OnUserPostNick(User* user, const std::string &oldnick) override
+	void OnUserPostNick(User* user, const std::string& oldnick) override
 	{
 		if (isdigit(user->nick[0])) /* allow switches to UID */
 			return;
 
 		for (const auto* memb : user->chans)
 		{
-			nickfloodsettings *f = nf.ext.Get(memb->chan);
+			nickfloodsettings* f = nf.ext.Get(memb->chan);
 			if (f)
 			{
 				ModResult res = CheckExemption::Call(exemptionprov, user, memb->chan, "nickflood");
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 0e912c2ce..7696fbc41 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -169,7 +169,7 @@ public:
 
 	void Prioritize() override
 	{
-		Module *nflood = ServerInstance->Modules.Find("nickflood");
+		Module* nflood = ServerInstance->Modules.Find("nickflood");
 		ServerInstance->Modules.SetPriority(this, I_OnUserPreNick, PRIORITY_BEFORE, nflood);
 	}
 };
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index ab11e9e47..f988d5f80 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -43,7 +43,7 @@ public:
 	{
 	}
 
-	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) override
+	ModResult OnUserPreKick(User* source, Membership* memb, const std::string& reason) override
 	{
 		bool modeset = memb->chan->IsModeSet(nk);
 		if (!extban.GetStatus(source, memb->chan).check(!modeset))
diff --git a/src/modules/m_nopartmsg.cpp b/src/modules/m_nopartmsg.cpp
index 1319c92d0..4cbcabaa6 100644
--- a/src/modules/m_nopartmsg.cpp
+++ b/src/modules/m_nopartmsg.cpp
@@ -39,7 +39,7 @@ public:
 	{
 	}
 
-	void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) override
+	void OnUserPart(Membership* memb, std::string& partmessage, CUList& excepts) override
 	{
 		if (!IS_LOCAL(memb->user))
 			return;
diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 12b0b306e..b5cc9299a 100644
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -141,7 +141,7 @@ public:
 		mycommand.op = Conf->getBool("op", true);
 	}
 
-	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) override
+	ModResult OnUserPreKick(User* source, Membership* memb, const std::string& reason) override
 	{
 		// Don't do anything if they're not +Y
 		if (!memb->HasMode(&np))
diff --git a/src/modules/m_operlevels.cpp b/src/modules/m_operlevels.cpp
index 2ea8e150e..0d5d19d1e 100644
--- a/src/modules/m_operlevels.cpp
+++ b/src/modules/m_operlevels.cpp
@@ -36,7 +36,7 @@ class ModuleOperLevels final
 		{
 		}
 
-		ModResult OnKill(User* source, User* dest, const std::string &reason) override
+		ModResult OnKill(User* source, User* dest, const std::string& reason) override
 		{
 			// oper killing an oper?
 			if (dest->IsOper() && source->IsOper())
diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index fa9ae2fe5..f74453a65 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -167,7 +167,7 @@ public:
 		return ((tokenlist.find(token, 0) != std::string::npos) || (tokenlist.find('*', 0) != std::string::npos));
 	}
 
-	ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) override
+	ModResult OnPreTopicChange(User* source, Channel* channel, const std::string& topic) override
 	{
 		if (IS_LOCAL(source) && source->IsOper() && CanOverride(source, "TOPIC"))
 		{
@@ -183,7 +183,7 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) override
+	ModResult OnUserPreKick(User* source, Membership* memb, const std::string& reason) override
 	{
 		if (source->IsOper() && CanOverride(source,"KICK"))
 		{
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 5c875071a..e39a380ff 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -274,7 +274,7 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnPostTopicChange(User*, Channel *c, const std::string&) override
+	void OnPostTopicChange(User*, Channel* c, const std::string&) override
 	{
 		if (c->IsModeSet(p))
 			dirty = true;
@@ -318,7 +318,7 @@ public:
 		}
 	}
 
-	ModResult OnChannelPreDelete(Channel *c) override
+	ModResult OnChannelPreDelete(Channel* c) override
 	{
 		if (c->IsModeSet(p))
 			return MOD_RES_DENY;
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 4001150b5..7065102b3 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -157,7 +157,7 @@ public:
 				user->WriteNotice("*** Invalid duration for R-line.");
 				return CmdResult::FAILURE;
 			}
-			XLine *r = nullptr;
+			XLine* r = nullptr;
 
 			try
 			{
@@ -254,7 +254,7 @@ public:
 	ModResult OnUserRegister(LocalUser* user) override
 	{
 		// Apply lines on user connect
-		XLine *rl = ServerInstance->XLines->MatchesLine("R", user);
+		XLine* rl = ServerInstance->XLines->MatchesLine("R", user);
 
 		if (rl)
 		{
@@ -303,7 +303,7 @@ public:
 		return MOD_RES_DENY;
 	}
 
-	void OnUserPostNick(User *user, const std::string &oldnick) override
+	void OnUserPostNick(User* user, const std::string& oldnick) override
 	{
 		if (!IS_LOCAL(user))
 			return;
@@ -311,7 +311,7 @@ public:
 		if (!MatchOnNickChange)
 			return;
 
-		XLine *rl = ServerInstance->XLines->MatchesLine("R", user);
+		XLine* rl = ServerInstance->XLines->MatchesLine("R", user);
 
 		if (rl)
 		{
diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp
index 5aadffb51..86f77d24f 100644
--- a/src/modules/m_samode.cpp
+++ b/src/modules/m_samode.cpp
@@ -133,7 +133,7 @@ public:
 		Module* disable = ServerInstance->Modules.Find("disable");
 		ServerInstance->Modules.SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disable);
 
-		Module *override = ServerInstance->Modules.Find("override");
+		Module* override = ServerInstance->Modules.Find("override");
 		ServerInstance->Modules.SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override);
 	}
 };
diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 442a40e6b..70f0daf2b 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -210,7 +210,7 @@ public:
 		SendSASL(user, "*", 'S', params);
 	}
 
-	static SaslResult GetSaslResult(const std::string &result_)
+	static SaslResult GetSaslResult(const std::string& result_)
 	{
 		if (result_ == "F")
 			return SASL_FAIL;
@@ -347,7 +347,7 @@ public:
 				return CmdResult::FAILURE;
 			}
 
-			SaslAuthenticator *sasl = authExt.Get(user);
+			SaslAuthenticator* sasl = authExt.Get(user);
 			if (!sasl)
 				authExt.SetFwd(user, user, parameters[0], sslapi);
 			else if (!sasl->SendClientMessage(parameters))
@@ -379,7 +379,7 @@ public:
 			return CmdResult::FAILURE;
 		}
 
-		SaslAuthenticator *sasl = authExt.Get(target);
+		SaslAuthenticator* sasl = authExt.Get(target);
 		if (!sasl)
 			return CmdResult::FAILURE;
 
diff --git a/src/modules/m_seenicks.cpp b/src/modules/m_seenicks.cpp
index 208a16eb8..0c7652a53 100644
--- a/src/modules/m_seenicks.cpp
+++ b/src/modules/m_seenicks.cpp
@@ -37,7 +37,7 @@ public:
 		ServerInstance->SNO.EnableSnomask('n',"NICK");
 	}
 
-	void OnUserPostNick(User* user, const std::string &oldnick) override
+	void OnUserPostNick(User* user, const std::string& oldnick) override
 	{
 		ServerInstance->SNO.WriteToSnoMask(IS_LOCAL(user) ? 'n' : 'N',"User %s changed their nickname to %s", oldnick.c_str(), user->nick.c_str());
 	}
diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 19717300c..86e39be23 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -262,7 +262,7 @@ public:
 		}
 	}
 
-	void OnUserPostNick(User* user, const std::string &oldnick) override
+	void OnUserPostNick(User* user, const std::string& oldnick) override
 	{
 		/* On nickchange, if they have +r, remove it */
 		if ((user->IsModeSet(userregmode)) && (ServerInstance->Users.FindNick(oldnick) != user))
diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp
index fb15886f6..b1ac0e014 100644
--- a/src/modules/m_servprotect.cpp
+++ b/src/modules/m_servprotect.cpp
@@ -82,7 +82,7 @@ public:
 
 			/* Check if the parameter is a valid nick/uuid
 			 */
-			User *u = ServerInstance->Users.Find(change.param);
+			User* u = ServerInstance->Users.Find(change.param);
 			if (u)
 			{
 				Membership* memb = chan->GetUser(u);
@@ -102,7 +102,7 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnKill(User* src, User* dst, const std::string &reason) override
+	ModResult OnKill(User* src, User* dst, const std::string& reason) override
 	{
 		if (!src)
 			return MOD_RES_PASSTHRU;
@@ -116,7 +116,7 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnUserPreKick(User *src, Membership* memb, const std::string &reason) override
+	ModResult OnUserPreKick(User* src, Membership* memb, const std::string& reason) override
 	{
 		if (memb->user->IsModeSet(bm))
 		{
diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index d13b0443d..d23ac00db 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -71,7 +71,7 @@ public:
 
 		std::string target = parameters[0];
 
-		User *find = ServerInstance->Users.Find(target);
+		User* find = ServerInstance->Users.Find(target);
 		if ((find) && (find->registered == REG_ALL))
 			target = "*!" + find->GetBanIdent() + "@" + find->GetIPString();
 
diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index 08533f5a8..dd121d9f9 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -392,7 +392,7 @@ void TreeSocket::SendCapabilities(int phase)
 }
 
 /* Isolate and return the elements that are different between two comma separated lists */
-void TreeSocket::ListDifference(const std::string &one, const std::string &two, char sep,
+void TreeSocket::ListDifference(const std::string& one, const std::string& two, char sep,
 		std::string& mleft, std::string& mright)
 {
 	std::set<std::string> values;
diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp
index eac406184..bd3895c6b 100644
--- a/src/modules/m_spanningtree/hmac.cpp
+++ b/src/modules/m_spanningtree/hmac.cpp
@@ -37,7 +37,7 @@ const std::string& TreeSocket::GetOurChallenge()
 	return capab->ourchallenge;
 }
 
-void TreeSocket::SetOurChallenge(const std::string &c)
+void TreeSocket::SetOurChallenge(const std::string& c)
 {
 	capab->ourchallenge = c;
 }
@@ -47,12 +47,12 @@ const std::string& TreeSocket::GetTheirChallenge()
 	return capab->theirchallenge;
 }
 
-void TreeSocket::SetTheirChallenge(const std::string &c)
+void TreeSocket::SetTheirChallenge(const std::string& c)
 {
 	capab->theirchallenge = c;
 }
 
-std::string TreeSocket::MakePass(const std::string &password, const std::string &challenge)
+std::string TreeSocket::MakePass(const std::string& password, const std::string& challenge)
 {
 	/* This is a simple (maybe a bit hacky?) HMAC algorithm, thanks to jilles for
 	 * suggesting the use of HMAC to secure the password against various attacks.
@@ -70,7 +70,7 @@ std::string TreeSocket::MakePass(const std::string &password, const std::string
 	return password;
 }
 
-bool TreeSocket::ComparePass(const Link& link, const std::string &theirs)
+bool TreeSocket::ComparePass(const Link& link, const std::string& theirs)
 {
 	capab->auth_fingerprint = !link.Fingerprint.empty();
 	capab->auth_challenge = !capab->ourchallenge.empty() && !capab->theirchallenge.empty();
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index c5fbcdce2..cc5a559ff 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -403,7 +403,7 @@ ModResult ModuleSpanningTree::OnPreTopicChange(User* user, Channel* chan, const
 	return MOD_RES_PASSTHRU;
 }
 
-void ModuleSpanningTree::OnPostTopicChange(User* user, Channel* chan, const std::string &topic)
+void ModuleSpanningTree::OnPostTopicChange(User* user, Channel* chan, const std::string& topic)
 {
 	// Drop remote events on the floor.
 	if (!IS_LOCAL(user))
@@ -572,7 +572,7 @@ void ModuleSpanningTree::OnChangeRealName(User* user, const std::string& real)
 	CmdBuilder(user, "FNAME").push_last(real).Broadcast();
 }
 
-void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident)
+void ModuleSpanningTree::OnChangeIdent(User* user, const std::string& ident)
 {
 	if ((user->registered != REG_ALL) || (!IS_LOCAL(user)))
 		return;
@@ -580,7 +580,7 @@ void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident)
 	CmdBuilder(user, "FIDENT").push(ident).Broadcast();
 }
 
-void ModuleSpanningTree::OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts)
+void ModuleSpanningTree::OnUserPart(Membership* memb, std::string& partmessage, CUList& excepts)
 {
 	if (IS_LOCAL(memb->user))
 	{
@@ -592,7 +592,7 @@ void ModuleSpanningTree::OnUserPart(Membership* memb, std::string &partmessage,
 	}
 }
 
-void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
+void ModuleSpanningTree::OnUserQuit(User* user, const std::string& reason, const std::string& oper_message)
 {
 	if (IS_LOCAL(user))
 	{
@@ -619,7 +619,7 @@ void ModuleSpanningTree::OnUserQuit(User* user, const std::string &reason, const
 	TreeServer::Get(user)->UserCount--;
 }
 
-void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
+void ModuleSpanningTree::OnUserPostNick(User* user, const std::string& oldnick)
 {
 	if (IS_LOCAL(user))
 	{
@@ -635,7 +635,7 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
 	}
 }
 
-void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
+void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::string& reason, CUList& excepts)
 {
 	if ((!IS_LOCAL(source)) && (source != ServerInstance->FakeClient))
 		return;
@@ -650,7 +650,7 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s
 	params.Broadcast();
 }
 
-void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
+void ModuleSpanningTree::OnPreRehash(User* user, const std::string& parameter)
 {
 	ServerInstance->Logs.Debug(MODNAME, "OnPreRehash called with param %s", parameter.c_str());
 
@@ -782,7 +782,7 @@ void ModuleSpanningTree::OnOper(User* user)
 	CommandOpertype::Builder(user).Broadcast();
 }
 
-void ModuleSpanningTree::OnAddLine(User* user, XLine *x)
+void ModuleSpanningTree::OnAddLine(User* user, XLine* x)
 {
 	if (!x->IsBurstable() || loopCall || (user && !IS_LOCAL(user)))
 		return;
@@ -793,7 +793,7 @@ void ModuleSpanningTree::OnAddLine(User* user, XLine *x)
 	CommandAddLine::Builder(x, user).Broadcast();
 }
 
-void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
+void ModuleSpanningTree::OnDelLine(User* user, XLine* x)
 {
 	if (!x->IsBurstable() || loopCall || (user && !IS_LOCAL(user)))
 		return;
diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index 4b14352b9..dd2805557 100644
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -181,7 +181,7 @@ public:
 	void OnUserConnect(LocalUser* source) override;
 	void OnUserInvite(User* source, User* dest, Channel* channel, time_t timeout, ModeHandler::Rank notifyrank, CUList& notifyexcepts) override;
 	ModResult OnPreTopicChange(User* user, Channel* chan, const std::string& topic) override;
-	void OnPostTopicChange(User* user, Channel* chan, const std::string &topic) override;
+	void OnPostTopicChange(User* user, Channel* chan, const std::string& topic) override;
 	void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) override;
 	void OnUserPostTagMessage(User* user, const MessageTarget& target, const CTCTags::TagMessageDetails& details) override;
 	void OnBackgroundTimer(time_t curtime) override;
@@ -189,16 +189,16 @@ public:
 	void OnChangeHost(User* user, const std::string& newhost) override;
 	void OnChangeRealHost(User* user, const std::string& newhost) override;
 	void OnChangeRealName(User* user, const std::string& real) override;
-	void OnChangeIdent(User* user, const std::string &ident) override;
-	void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) override;
-	void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) override;
-	void OnUserPostNick(User* user, const std::string &oldnick) override;
-	void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) override;
-	void OnPreRehash(User* user, const std::string &parameter) override;
+	void OnChangeIdent(User* user, const std::string& ident) override;
+	void OnUserPart(Membership* memb, std::string& partmessage, CUList& excepts) override;
+	void OnUserQuit(User* user, const std::string& reason, const std::string& oper_message) override;
+	void OnUserPostNick(User* user, const std::string& oldnick) override;
+	void OnUserKick(User* source, Membership* memb, const std::string& reason, CUList& excepts) override;
+	void OnPreRehash(User* user, const std::string& parameter) override;
 	void ReadConfig(ConfigStatus& status) override;
 	void OnOper(User* user) override;
-	void OnAddLine(User *u, XLine *x) override;
-	void OnDelLine(User *u, XLine *x) override;
+	void OnAddLine(User* u, XLine* x) override;
+	void OnDelLine(User* u, XLine* x) override;
 	ModResult OnStats(Stats::Context& stats) override;
 	void OnUserAway(User* user) override;
 	void OnUserBack(User* user) override;
diff --git a/src/modules/m_spanningtree/precommand.cpp b/src/modules/m_spanningtree/precommand.cpp
index b9f745deb..0c60fbed4 100644
--- a/src/modules/m_spanningtree/precommand.cpp
+++ b/src/modules/m_spanningtree/precommand.cpp
@@ -25,7 +25,7 @@
 
 #include "main.h"
 
-ModResult ModuleSpanningTree::OnPreCommand(std::string &command, CommandBase::Params& parameters, LocalUser *user, bool validated)
+ModResult ModuleSpanningTree::OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated)
 {
 	/* If the command doesnt appear to be valid, we dont want to mess with it. */
 	if (!validated)
diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp
index d8369089d..8f65bf4d7 100644
--- a/src/modules/m_spanningtree/protocolinterface.cpp
+++ b/src/modules/m_spanningtree/protocolinterface.cpp
@@ -102,7 +102,7 @@ void SpanningTreeProtocolInterface::Server::SendMetaData(const std::string& key,
 	sock->WriteLine(CommandMetadata::Builder(key, data));
 }
 
-void SpanningTreeProtocolInterface::SendSNONotice(char snomask, const std::string &text)
+void SpanningTreeProtocolInterface::SendSNONotice(char snomask, const std::string& text)
 {
 	CmdBuilder("SNONOTICE").push(snomask).push_last(text).Broadcast();
 }
diff --git a/src/modules/m_spanningtree/resolvers.cpp b/src/modules/m_spanningtree/resolvers.cpp
index 6c4577be1..44e3e7dc6 100644
--- a/src/modules/m_spanningtree/resolvers.cpp
+++ b/src/modules/m_spanningtree/resolvers.cpp
@@ -46,7 +46,7 @@ ServernameResolver::ServernameResolver(DNS::Manager* mgr, const std::string& hos
 {
 }
 
-void ServernameResolver::OnLookupComplete(const DNS::Query *r)
+void ServernameResolver::OnLookupComplete(const DNS::Query* r)
 {
 	const DNS::ResourceRecord* const ans_record = r->FindAnswerOfType(this->question.type);
 	if (!ans_record)
@@ -81,7 +81,7 @@ void ServernameResolver::OnLookupComplete(const DNS::Query *r)
 	}
 }
 
-void ServernameResolver::OnError(const DNS::Query *r)
+void ServernameResolver::OnError(const DNS::Query* r)
 {
 	if (r->error == DNS::ERROR_UNLOADED)
 	{
@@ -132,7 +132,7 @@ bool SecurityIPResolver::CheckIPv4()
 	}
 }
 
-void SecurityIPResolver::OnLookupComplete(const DNS::Query *r)
+void SecurityIPResolver::OnLookupComplete(const DNS::Query* r)
 {
 	for (std::shared_ptr<Link> L : Utils->LinkBlocks)
 	{
@@ -154,7 +154,7 @@ void SecurityIPResolver::OnLookupComplete(const DNS::Query *r)
 	CheckIPv4();
 }
 
-void SecurityIPResolver::OnError(const DNS::Query *r)
+void SecurityIPResolver::OnError(const DNS::Query* r)
 {
 	// This can be called because of us being unloaded but we don't have to do anything differently
 	if (CheckIPv4())
diff --git a/src/modules/m_spanningtree/resolvers.h b/src/modules/m_spanningtree/resolvers.h
index dc82bd329..c9e02f6cf 100644
--- a/src/modules/m_spanningtree/resolvers.h
+++ b/src/modules/m_spanningtree/resolvers.h
@@ -44,8 +44,8 @@ private:
 	bool CheckIPv4();
 public:
 	SecurityIPResolver(Module* me, DNS::Manager* mgr, const std::string& hostname, std::shared_ptr<Link> x, DNS::QueryType qt);
-	void OnLookupComplete(const DNS::Query *r) override;
-	void OnError(const DNS::Query *q) override;
+	void OnLookupComplete(const DNS::Query* r) override;
+	void OnError(const DNS::Query* q) override;
 };
 
 /** This class is used to resolve server hostnames during /connect and autoconnect.
@@ -64,6 +64,6 @@ private:
 	std::shared_ptr<Autoconnect> myautoconnect;
 public:
 	ServernameResolver(DNS::Manager* mgr, const std::string& hostname, std::shared_ptr<Link> x, DNS::QueryType qt, std::shared_ptr<Autoconnect> myac);
-	void OnLookupComplete(const DNS::Query *r) override;
-	void OnError(const DNS::Query *q) override;
+	void OnLookupComplete(const DNS::Query* r) override;
+	void OnError(const DNS::Query* q) override;
 };
diff --git a/src/modules/m_spanningtree/rsquit.cpp b/src/modules/m_spanningtree/rsquit.cpp
index 52500f5f5..cdc3cce62 100644
--- a/src/modules/m_spanningtree/rsquit.cpp
+++ b/src/modules/m_spanningtree/rsquit.cpp
@@ -40,7 +40,7 @@ CommandRSQuit::CommandRSQuit(Module* Creator)
 
 CmdResult CommandRSQuit::Handle(User* user, const Params& parameters)
 {
-	TreeServer *server_target; // Server to squit
+	TreeServer* server_target; // Server to squit
 
 	server_target = Utils->FindServerMask(parameters[0]);
 	if (!server_target)
diff --git a/src/modules/m_spanningtree/treesocket.h b/src/modules/m_spanningtree/treesocket.h
index 914123bf5..d31d978f3 100644
--- a/src/modules/m_spanningtree/treesocket.h
+++ b/src/modules/m_spanningtree/treesocket.h
@@ -209,7 +209,7 @@ public:
 
 	/** Get challenge set in our CAPAB for challenge/response
 	 */
-	void SetOurChallenge(const std::string &c);
+	void SetOurChallenge(const std::string& c);
 
 	/** Get challenge set in their CAPAB for challenge/response
 	 */
@@ -217,11 +217,11 @@ public:
 
 	/** Get challenge set in their CAPAB for challenge/response
 	 */
-	void SetTheirChallenge(const std::string &c);
+	void SetTheirChallenge(const std::string& c);
 
 	/** Compare two passwords based on authentication scheme
 	 */
-	bool ComparePass(const Link& link, const std::string &theirs);
+	bool ComparePass(const Link& link, const std::string& theirs);
 
 	/** Clean up information used only during server negotiation
 	 */
@@ -232,7 +232,7 @@ public:
 	/** Construct a password, optionally hashed with the other side's
 	 * challenge string
 	 */
-	static std::string MakePass(const std::string &password, const std::string &challenge);
+	static std::string MakePass(const std::string& password, const std::string& challenge);
 
 	/** When an outbound connection finishes connecting, we receive
 	 * this event, and must send our SERVER string to the other
@@ -249,7 +249,7 @@ public:
 	/** Sends an error to the remote server, and displays it locally to show
 	 * that it was sent.
 	 */
-	void SendError(const std::string &errormessage);
+	void SendError(const std::string& errormessage);
 
 	/** Recursively send the server tree with distances as hops.
 	 * This is used during network burst to inform the other server
@@ -273,7 +273,7 @@ public:
 	void SendCapabilities(int phase);
 
 	/* Isolate and return the elements that are different between two lists */
-	static void ListDifference(const std::string &one, const std::string &two, char sep,
+	static void ListDifference(const std::string& one, const std::string& two, char sep,
 		std::string& mleft, std::string& mright);
 
 	bool Capab(const CommandBase::Params& params);
@@ -323,7 +323,7 @@ public:
 
 	/** Process complete line from buffer
 	 */
-	void ProcessLine(std::string &line);
+	void ProcessLine(std::string& line);
 
 	/** Process message tags received from a remote server. */
 	static void ProcessTag(User* source, const std::string& tag, ClientProtocol::TagMap& tags);
diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp
index f66227084..af97b28ed 100644
--- a/src/modules/m_spanningtree/treesocket1.cpp
+++ b/src/modules/m_spanningtree/treesocket1.cpp
@@ -150,7 +150,7 @@ void TreeSocket::OnError(BufferedSocketError e)
 	Close();
 }
 
-void TreeSocket::SendError(const std::string &errormessage)
+void TreeSocket::SendError(const std::string& errormessage)
 {
 	WriteLine("ERROR :"+errormessage);
 	DoWrite();
diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index cacccf544..e78506a08 100644
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -86,7 +86,7 @@ void TreeSocket::Split(const std::string& line, std::string& tags, std::string&
 		params.push_back(token);
 }
 
-void TreeSocket::ProcessLine(std::string &line)
+void TreeSocket::ProcessLine(std::string& line)
 {
 	std::string tags;
 	std::string prefix;
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index b4e1fd0ef..aae4c4a07 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -55,7 +55,7 @@ ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from
 	return MOD_RES_DENY;
 }
 
-TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
+TreeServer* SpanningTreeUtilities::FindServer(const std::string& ServerName)
 {
 	if (InspIRCd::IsSID(ServerName))
 		return this->FindServerID(ServerName);
@@ -74,7 +74,7 @@ TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
 /** Find the first server matching a given glob mask.
  * We iterate over the list and match each one until we get a hit.
  */
-TreeServer* SpanningTreeUtilities::FindServerMask(const std::string &ServerName)
+TreeServer* SpanningTreeUtilities::FindServerMask(const std::string& ServerName)
 {
 	for (const auto& [name, server] : serverlist)
 	{
@@ -84,7 +84,7 @@ TreeServer* SpanningTreeUtilities::FindServerMask(const std::string &ServerName)
 	return nullptr;
 }
 
-TreeServer* SpanningTreeUtilities::FindServerID(const std::string &id)
+TreeServer* SpanningTreeUtilities::FindServerID(const std::string& id)
 {
 	server_hash::iterator iter = sidlist.find(id);
 	if (iter != sidlist.end())
diff --git a/src/modules/m_spanningtree/utils.h b/src/modules/m_spanningtree/utils.h
index dcf5b73c2..2b3dee08e 100644
--- a/src/modules/m_spanningtree/utils.h
+++ b/src/modules/m_spanningtree/utils.h
@@ -87,7 +87,7 @@ public:
 	unsigned long PingWarnTime;
 	/** This variable represents the root of the server tree
 	 */
-	TreeServer *TreeRoot = nullptr;
+	TreeServer* TreeRoot = nullptr;
 	/** IPs allowed to link to us
 	 */
 	std::vector<std::string> ValidIPs;
@@ -147,11 +147,11 @@ public:
 
 	/** Find a server by name or SID
 	 */
-	TreeServer* FindServer(const std::string &ServerName);
+	TreeServer* FindServer(const std::string& ServerName);
 
 	/** Find server by SID
 	 */
-	TreeServer* FindServerID(const std::string &id);
+	TreeServer* FindServerID(const std::string& id);
 
 	/** Find a server based on a target string.
 	 * @param target Target string where a command should be routed to. May be a server name, a sid, a nickname or a uuid.
@@ -160,7 +160,7 @@ public:
 
 	/** Find a server by glob mask
 	 */
-	TreeServer* FindServerMask(const std::string &ServerName);
+	TreeServer* FindServerMask(const std::string& ServerName);
 
 	/** Find a link tag from a server name
 	 */
diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp
index d27dc7866..632de2bb1 100644
--- a/src/modules/m_topiclock.cpp
+++ b/src/modules/m_topiclock.cpp
@@ -91,7 +91,7 @@ public:
 	{
 	}
 
-	ModResult OnPreTopicChange(User* user, Channel* chan, const std::string &topic) override
+	ModResult OnPreTopicChange(User* user, Channel* chan, const std::string& topic) override
 	{
 		// Only fired for local users currently, but added a check anyway
 		if ((IS_LOCAL(user)) && (topiclock.Get(chan)))
diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index 0c8dcdae0..793ca1fb5 100644
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -35,13 +35,13 @@ void SnomaskManager::FlushSnotices()
 		mask.Flush();
 }
 
-void SnomaskManager::EnableSnomask(char letter, const std::string &type)
+void SnomaskManager::EnableSnomask(char letter, const std::string& type)
 {
 	if (letter >= 'a' && letter <= 'z')
 		masks[letter - 'a'].Description = type;
 }
 
-void SnomaskManager::WriteToSnoMask(char letter, const std::string &text)
+void SnomaskManager::WriteToSnoMask(char letter, const std::string& text)
 {
 	if (letter >= 'a' && letter <= 'z')
 		masks[letter - 'a'].SendMessage(text, letter);
diff --git a/src/socketengine.cpp b/src/socketengine.cpp
index 1abad5282..229316c0d 100644
--- a/src/socketengine.cpp
+++ b/src/socketengine.cpp
@@ -157,7 +157,7 @@ bool SocketEngine::AddFdRef(EventHandler* eh)
 	return true;
 }
 
-void SocketEngine::DelFdRef(EventHandler *eh)
+void SocketEngine::DelFdRef(EventHandler* eh)
 {
 	int fd = eh->GetFd();
 	if (GetRef(fd) == eh)
@@ -184,7 +184,7 @@ bool SocketEngine::BoundsCheckFd(EventHandler* eh)
 	return eh && eh->HasFd();
 }
 
-int SocketEngine::Accept(EventHandler* fd, sockaddr *addr, socklen_t *addrlen)
+int SocketEngine::Accept(EventHandler* fd, sockaddr* addr, socklen_t* addrlen)
 {
 	return accept(fd->GetFd(), addr, addrlen);
 }
@@ -234,21 +234,21 @@ void SocketEngine::SetReuse(int fd)
 	setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<char*>(&on), sizeof(on));
 }
 
-ssize_t SocketEngine::RecvFrom(EventHandler* fd, void *buf, size_t len, int flags, sockaddr *from, socklen_t *fromlen)
+ssize_t SocketEngine::RecvFrom(EventHandler* fd, void* buf, size_t len, int flags, sockaddr* from, socklen_t* fromlen)
 {
 	ssize_t nbRecvd = recvfrom(fd->GetFd(), static_cast<char*>(buf), len, flags, from, fromlen);
 	stats.UpdateReadCounters(nbRecvd);
 	return nbRecvd;
 }
 
-ssize_t SocketEngine::Send(EventHandler* fd, const void *buf, size_t len, int flags)
+ssize_t SocketEngine::Send(EventHandler* fd, const void* buf, size_t len, int flags)
 {
 	ssize_t nbSent = send(fd->GetFd(), static_cast<const char*>(buf), len, flags);
 	stats.UpdateWriteCounters(nbSent);
 	return nbSent;
 }
 
-ssize_t SocketEngine::Recv(EventHandler* fd, void *buf, size_t len, int flags)
+ssize_t SocketEngine::Recv(EventHandler* fd, void* buf, size_t len, int flags)
 {
 	ssize_t nbRecvd = recv(fd->GetFd(), static_cast<char*>(buf), len, flags);
 	stats.UpdateReadCounters(nbRecvd);
diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 0ab67b707..da2fbc909 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -313,7 +313,7 @@ void UserManager::AddClone(User* user)
 		counts.local++;
 }
 
-void UserManager::RemoveCloneCounts(User *user)
+void UserManager::RemoveCloneCounts(User* user)
 {
 	CloneMap::iterator it = clonemap.find(user->GetCIDRMask());
 	if (it != clonemap.end())
diff --git a/src/users.cpp b/src/users.cpp
index eba46f4c4..9a9a39eda 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -306,7 +306,7 @@ void UserIOHandler::OnDataReady()
 		ServerInstance->Users.QuitUser(user, "Excess Flood");
 }
 
-void UserIOHandler::AddWriteBuf(const std::string &data)
+void UserIOHandler::AddWriteBuf(const std::string& data)
 {
 	if (user->quitting_sendq)
 		return;
@@ -533,7 +533,7 @@ bool LocalUser::CheckLines(bool doZline)
 	{
 		for (int n = 0; check[n]; ++n)
 		{
-			XLine *r = ServerInstance->XLines->MatchesLine(check[n], this);
+			XLine* r = ServerInstance->XLines->MatchesLine(check[n], this);
 
 			if (r)
 			{
@@ -947,7 +947,7 @@ void User::WriteRemoteNumeric(const Numeric::Numeric& numeric)
  * Don't quote me on the maths as i am not a mathematician or computer scientist,
  * but i believe this algorithm is now x+(log y) maximum iterations instead.
  */
-bool User::SharesChannelWith(User *other)
+bool User::SharesChannelWith(User* other)
 {
 	for (const auto* memb : chans)
 	{
@@ -1060,7 +1060,7 @@ bool User::ChangeIdent(const std::string& newident)
  * then their ip will be taken as 'priority' anyway, so for example,
  * <connect allow="127.0.0.1"> will match joe!bloggs@localhost
  */
-void LocalUser::SetClass(const std::string &explicit_name)
+void LocalUser::SetClass(const std::string& explicit_name)
 {
 	ServerInstance->Logs.Debug("CONNECTCLASS", "Setting connect class for %s (%s) ...",
 		this->uuid.c_str(), this->GetFullRealHost().c_str());
diff --git a/src/xline.cpp b/src/xline.cpp
index 2f4f67395..d46c1332f 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -146,7 +146,7 @@ public:
  *  bans. :)
  */
 
-bool XLine::Matches(User *u)
+bool XLine::Matches(User* u)
 {
 	return false;
 }
@@ -178,7 +178,7 @@ void XLineManager::CheckELines()
 			safei = i;
 			safei++;
 
-			XLine *e = i->second;
+			XLine* e = i->second;
 			if ((!e->duration || ServerInstance->Time() < e->expiry) && e->Matches(u))
 				u->exempt = true;
 
@@ -187,7 +187,7 @@ void XLineManager::CheckELines()
 	}
 }
 
-XLineLookup* XLineManager::GetAll(const std::string &type)
+XLineLookup* XLineManager::GetAll(const std::string& type)
 {
 	ContainerIter n = lookup_lines.find(type);
 
@@ -212,7 +212,7 @@ XLineLookup* XLineManager::GetAll(const std::string &type)
 	return &(n->second);
 }
 
-void XLineManager::DelAll(const std::string &type)
+void XLineManager::DelAll(const std::string& type)
 {
 	ContainerIter n = lookup_lines.find(type);
 
@@ -236,7 +236,7 @@ std::vector<std::string> XLineManager::GetAllTypes()
 	return items;
 }
 
-IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
+IdentHostPair XLineManager::IdentSplit(const std::string& ident_and_host)
 {
 	IdentHostPair n = std::make_pair<std::string,std::string>("*","*");
 	std::string::size_type x = ident_and_host.find('@');
@@ -357,7 +357,7 @@ void ELine::Unset()
 
 // returns a pointer to the reason if a nickname matches a Q-line, NULL if it didn't match
 
-XLine* XLineManager::MatchesLine(const std::string &type, User* user)
+XLine* XLineManager::MatchesLine(const std::string& type, User* user)
 {
 	ContainerIter x = lookup_lines.find(type);
 
@@ -391,7 +391,7 @@ XLine* XLineManager::MatchesLine(const std::string &type, User* user)
 	return nullptr;
 }
 
-XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pattern)
+XLine* XLineManager::MatchesLine(const std::string& type, const std::string& pattern)
 {
 	ContainerIter x = lookup_lines.find(type);
 
@@ -546,7 +546,7 @@ bool XLine::IsBurstable()
 	return !from_config;
 }
 
-void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
+void XLine::DefaultApply(User* u, const std::string& line, bool bancache)
 {
 	const std::string banReason = line + "-lined: " + reason;
 
@@ -565,7 +565,7 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 	}
 }
 
-bool KLine::Matches(User *u)
+bool KLine::Matches(User* u)
 {
 	LocalUser* lu = IS_LOCAL(u);
 	if (lu && lu->exempt)
@@ -588,7 +588,7 @@ void KLine::Apply(User* u)
 	DefaultApply(u, "K", this->identmask ==  "*");
 }
 
-bool GLine::Matches(User *u)
+bool GLine::Matches(User* u)
 {
 	LocalUser* lu = IS_LOCAL(u);
 	if (lu && lu->exempt)
@@ -611,7 +611,7 @@ void GLine::Apply(User* u)
 	DefaultApply(u, "G", this->identmask == "*");
 }
 
-bool ELine::Matches(User *u)
+bool ELine::Matches(User* u)
 {
 	if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
 	{
@@ -625,7 +625,7 @@ bool ELine::Matches(User *u)
 	return false;
 }
 
-bool ZLine::Matches(User *u)
+bool ZLine::Matches(User* u)
 {
 	LocalUser* lu = IS_LOCAL(u);
 	if (lu && lu->exempt)
@@ -639,7 +639,7 @@ void ZLine::Apply(User* u)
 	DefaultApply(u, "Z", true);
 }
 
-bool QLine::Matches(User *u)
+bool QLine::Matches(User* u)
 {
 	return InspIRCd::Match(u->nick, this->nick);
 }
@@ -651,27 +651,27 @@ void QLine::Apply(User* u)
 	u->ChangeNick(u->uuid);
 }
 
-bool ZLine::Matches(const std::string &str)
+bool ZLine::Matches(const std::string& str)
 {
 	return InspIRCd::MatchCIDR(str, this->ipaddr);
 }
 
-bool QLine::Matches(const std::string &str)
+bool QLine::Matches(const std::string& str)
 {
 	return InspIRCd::Match(str, this->nick);
 }
 
-bool ELine::Matches(const std::string &str)
+bool ELine::Matches(const std::string& str)
 {
 	return InspIRCd::MatchCIDR(str, matchtext);
 }
 
-bool KLine::Matches(const std::string &str)
+bool KLine::Matches(const std::string& str)
 {
 	return InspIRCd::MatchCIDR(str, matchtext);
 }
 
-bool GLine::Matches(const std::string &str)
+bool GLine::Matches(const std::string& str)
 {
 	return InspIRCd::MatchCIDR(str, matchtext);
 }
@@ -747,7 +747,7 @@ bool XLineManager::UnregisterFactory(XLineFactory* xlf)
 	return true;
 }
 
-XLineFactory* XLineManager::GetFactory(const std::string &type)
+XLineFactory* XLineManager::GetFactory(const std::string& type)
 {
 	XLineFactMap::iterator n = line_factory.find(type);