From 87ec095a89bbc73a4dd16858bea499f466066212 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Tue, 6 Dec 2016 21:02:48 -0500
Subject: Remove many more old C style format strings in the protocol functions

---
 include/modules/protocol/charybdis.h | 2 +-
 include/modules/protocol/hybrid.h    | 4 ++--
 include/modules/protocol/plexus.h    | 2 +-
 include/modules/protocol/ratbox.h    | 2 +-
 include/modules/protocol/rfc1459.h   | 6 +++---
 include/modules/protocol/unreal.h    | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'include/modules')

diff --git a/include/modules/protocol/charybdis.h b/include/modules/protocol/charybdis.h
index 4d525c49d..d65e094a0 100644
--- a/include/modules/protocol/charybdis.h
+++ b/include/modules/protocol/charybdis.h
@@ -43,7 +43,7 @@ class EUID : public IRCDMessage
 class ServerMessage : public IRCDMessage
 {
  public:
-	ServerMessage(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
+	ServerMessage(Module *creator) : IRCDMessage(creator, "SERVER", 3) { }
 
 	// SERVER dev.anope.de 1 :charybdis test server
 	void Run(MessageSource &source, const std::vector<Anope::string> &params) override;
diff --git a/include/modules/protocol/hybrid.h b/include/modules/protocol/hybrid.h
index 9c1444f4d..943480f54 100644
--- a/include/modules/protocol/hybrid.h
+++ b/include/modules/protocol/hybrid.h
@@ -67,7 +67,7 @@ class Pong : public IRCDMessage
 class ServerMessage : public IRCDMessage
 {
  public:
-	ServerMessage(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
+	ServerMessage(Module *creator) : IRCDMessage(creator, "SERVER", 3) { }
 
 	void Run(MessageSource &source, const std::vector<Anope::string> &params) override;
 };
@@ -75,7 +75,7 @@ class ServerMessage : public IRCDMessage
 class SID : public IRCDMessage
 {
  public:
-	SID(Module *creator) : IRCDMessage(creator, "SID", 4) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
+	SID(Module *creator) : IRCDMessage(creator, "SID", 4) { }
 
 	void Run(MessageSource &source, const std::vector<Anope::string> &params) override;
 };
diff --git a/include/modules/protocol/plexus.h b/include/modules/protocol/plexus.h
index b87f3e6c7..0c5d8d8c0 100644
--- a/include/modules/protocol/plexus.h
+++ b/include/modules/protocol/plexus.h
@@ -33,7 +33,7 @@ class Encap : public IRCDMessage
 class ServerMessage : public IRCDMessage
 {
  public:
-	ServerMessage(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
+	ServerMessage(Module *creator) : IRCDMessage(creator, "SERVER", 3) { }
 
 	void Run(MessageSource &source, const std::vector<Anope::string> &params) override;
 };
diff --git a/include/modules/protocol/ratbox.h b/include/modules/protocol/ratbox.h
index 32710fbea..2ad4a5529 100644
--- a/include/modules/protocol/ratbox.h
+++ b/include/modules/protocol/ratbox.h
@@ -44,7 +44,7 @@ class Join : public rfc1459::Join
 class ServerMessage : public IRCDMessage
 {
  public:
-	ServerMessage(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
+	ServerMessage(Module *creator) : IRCDMessage(creator, "SERVER", 3) { }
 
 	void Run(MessageSource &source, const std::vector<Anope::string> &params) override;
 };
diff --git a/include/modules/protocol/rfc1459.h b/include/modules/protocol/rfc1459.h
index 635e151c8..4ef8f0313 100644
--- a/include/modules/protocol/rfc1459.h
+++ b/include/modules/protocol/rfc1459.h
@@ -164,7 +164,7 @@ class Stats : public IRCDMessage
 class Time : public IRCDMessage
 {
  public:
-	Time(Module *creator, const Anope::string &mname = "TIME") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+	Time(Module *creator, const Anope::string &mname = "TIME") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
 	void Run(MessageSource &source, const std::vector<Anope::string> &params) override;
 };
@@ -180,7 +180,7 @@ class Topic : public IRCDMessage
 class Version : public IRCDMessage
 {
  public:
-	Version(Module *creator, const Anope::string &mname = "VERSION") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+	Version(Module *creator, const Anope::string &mname = "VERSION") : IRCDMessage(creator, mname, 0) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
 	void Run(MessageSource &source, const std::vector<Anope::string> &params) override;
 };
@@ -188,7 +188,7 @@ class Version : public IRCDMessage
 class Whois : public IRCDMessage
 {
  public:
- 	Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+	Whois(Module *creator, const Anope::string &mname = "WHOIS") : IRCDMessage(creator, mname, 1) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); SetFlag(IRCDMESSAGE_REQUIRE_USER); }
 
 	void Run(MessageSource &source, const std::vector<Anope::string> &params) override;
 };
diff --git a/include/modules/protocol/unreal.h b/include/modules/protocol/unreal.h
index 305d52bd0..88ed05997 100644
--- a/include/modules/protocol/unreal.h
+++ b/include/modules/protocol/unreal.h
@@ -139,7 +139,7 @@ struct SetName : IRCDMessage
 class ServerMessage : public IRCDMessage
 {
  public:
-	ServerMessage(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
+	ServerMessage(Module *creator) : IRCDMessage(creator, "SERVER", 3) { }
 
 	void Run(MessageSource &source, const std::vector<Anope::string> &params) override;
 };
-- 
cgit