Store mlock in the databases and removed some unused functions from misc.cpp

2 files changed, 1 insertions, 6 deletions

diff --git a/include/extern.h b/include/extern.h
index d670ad331..c158c6381 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -259,14 +259,9 @@ E char *str_signed(unsigned char *str);
 E std::list<Anope::string> BuildStringList(const Anope::string &, char = ' ');
 E std::vector<Anope::string> BuildStringVector(const Anope::string &, char = ' ');
 
-E uint32 cidr_to_netmask(uint16 cidr);
-E uint16 netmask_to_cidr(uint32 mask);
-
 E bool str_is_wildcard(const Anope::string &str);
 E bool str_is_pure_wildcard(const Anope::string &str);
 
-E bool str_is_cidr(const Anope::string &str, uint32 &ip, uint32 &mask, Anope::string &host);
-
 /**** modes.cpp ****/
 /* Number of generic modes we support */
 E unsigned GenericChannelModes, GenericUserModes;
diff --git a/include/regchannel.h b/include/regchannel.h
index 5d1735cb3..80277803c 100644
--- a/include/regchannel.h
+++ b/include/regchannel.h
@@ -302,7 +302,7 @@ class CoreExport ChannelInfo : public Extensible, public Flags<ChannelInfoFlag,
 	 * @param created When the mlock was created
 	 * @return true on success, false on failure (module blocking)
 	 */
-	bool SetMLock(ChannelMode *mode, bool status, const Anope::string &param = "", const Anope::string &setter = "", time_t created = Anope::CurTime);
+	bool SetMLock(ChannelMode *mode, bool status, const Anope::string &param = "", Anope::string setter = "", time_t created = Anope::CurTime);
 
 	/** Remove a mlock
 	 * @param mode The mode