Fixup some compilation warnings

5 files changed, 16 insertions, 18 deletions

diff --git a/modules/chanserv/flags.cpp b/modules/chanserv/flags.cpp
index 3c365ae6f..ecd8ba9d3 100644
--- a/modules/chanserv/flags.cpp
+++ b/modules/chanserv/flags.cpp
@@ -36,7 +36,7 @@ class FlagsChanAccessImpl : public FlagsChanAccess
  public:
 	using FlagsChanAccess::FlagsChanAccess;
 
-	const Anope::string &GetFlags() override;
+	const Anope::string GetFlags() override;
 	void SetFlags(const Anope::string &) override;
 
 	bool HasPriv(const Anope::string &priv) override
@@ -85,7 +85,7 @@ class FlagsChanAccessType : public ChanAccessType<FlagsChanAccessImpl>
 	}
 };
 
-const Anope::string &FlagsChanAccessImpl::GetFlags()
+const Anope::string FlagsChanAccessImpl::GetFlags()
 {
 	return Get(&FlagsChanAccessType::flags);
 }
diff --git a/modules/chanserv/log.cpp b/modules/chanserv/log.cpp
index 2e69eb2c7..ce6c378d3 100644
--- a/modules/chanserv/log.cpp
+++ b/modules/chanserv/log.cpp
@@ -274,8 +274,6 @@ public:
 					return;
 				}
 
-			bool override = !source.AccessFor(ci).HasPriv("SET");
-
 			std::vector<LogSetting *> ls = ci->GetRefs<LogSetting *>();
 			for (unsigned i = ls.size(); i > 0; --i)
 			{
diff --git a/modules/chanserv/xop.cpp b/modules/chanserv/xop.cpp
index 9373a042b..26de3ec41 100644
--- a/modules/chanserv/xop.cpp
+++ b/modules/chanserv/xop.cpp
@@ -40,7 +40,7 @@ class XOPChanAccessImpl : public XOPChanAccess
  public:
 	using XOPChanAccess::XOPChanAccess;
 
-	const Anope::string &GetType() override;
+	const Anope::string GetType() override;
 	void SetType(const Anope::string &) override;
 
 	bool HasPriv(const Anope::string &priv) override
@@ -109,7 +109,7 @@ class XOPChanAccessType : public ChanAccessType<XOPChanAccessImpl>
 	}
 };
 
-const Anope::string &XOPChanAccessImpl::GetType()
+const Anope::string XOPChanAccessImpl::GetType()
 {
 	return Get(&XOPChanAccessType::type);
 }
diff --git a/modules/hostserv/main/vhost.cpp b/modules/hostserv/main/vhost.cpp
index 7c08fe838..35442c9db 100644
--- a/modules/hostserv/main/vhost.cpp
+++ b/modules/hostserv/main/vhost.cpp
@@ -35,9 +35,9 @@ Anope::string VHostImpl::GetIdent()
 	return Get(&VHostType::vident);
 }
 
-void VHostImpl::SetIdent(const Anope::string &vident)
+void VHostImpl::SetIdent(const Anope::string &vi)
 {
-	Set(&VHostType::vident, vident);
+	Set(&VHostType::vident, vi);
 }
 
 Anope::string VHostImpl::GetHost()
@@ -45,9 +45,9 @@ Anope::string VHostImpl::GetHost()
 	return Get(&VHostType::vhost);
 }
 
-void VHostImpl::SetHost(const Anope::string &vhost)
+void VHostImpl::SetHost(const Anope::string &vh)
 {
-	Set(&VHostType::vhost, vhost);
+	Set(&VHostType::vhost, vh);
 }
 
 Anope::string VHostImpl::GetCreator()
@@ -55,9 +55,9 @@ Anope::string VHostImpl::GetCreator()
 	return Get(&VHostType::creator);
 }
 
-void VHostImpl::SetCreator(const Anope::string &creator)
+void VHostImpl::SetCreator(const Anope::string &c)
 {
-	Set(&VHostType::creator, creator);
+	Set(&VHostType::creator, c);
 }
 
 time_t VHostImpl::GetCreated()
@@ -65,9 +65,9 @@ time_t VHostImpl::GetCreated()
 	return Get(&VHostType::created);
 }
 
-void VHostImpl::SetCreated(time_t created)
+void VHostImpl::SetCreated(time_t cr)
 {
-	Set(&VHostType::created, created);
+	Set(&VHostType::created, cr);
 }
 
 bool VHostImpl::IsDefault()
@@ -75,7 +75,7 @@ bool VHostImpl::IsDefault()
 	return Get(&VHostType::default_);
 }
 
-void VHostImpl::SetDefault(bool default_)
+void VHostImpl::SetDefault(bool d)
 {
-	Set(&VHostType::default_, default_);
+	Set(&VHostType::default_, d);
 }
diff --git a/modules/memoserv/main/memoinfo.cpp b/modules/memoserv/main/memoinfo.cpp
index 093f8f4fa..09c45d278 100644
--- a/modules/memoserv/main/memoinfo.cpp
+++ b/modules/memoserv/main/memoinfo.cpp
@@ -57,9 +57,9 @@ NickServ::Account *MemoInfoImpl::GetAccount()
 	return Get(&MemoInfoType::account);
 }
 
-void MemoInfoImpl::SetAccount(NickServ::Account *account)
+void MemoInfoImpl::SetAccount(NickServ::Account *acc)
 {
-	Set(&MemoInfoType::account, account);
+	Set(&MemoInfoType::account, acc);
 }
 
 ChanServ::Channel *MemoInfoImpl::GetChannel()