From 5c9427cde0a949a17a476311db0a2a275345337b Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Sat, 18 May 2013 18:55:01 +0100 Subject: Remove the size argument from IsChannel and IsNick. There was only one case (which was probably an error) where these methods were not set to their ServerLimits value. --- src/helperfuncs.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/helperfuncs.cpp') diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 8a74a64e4..d11a13aa0 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -242,9 +242,9 @@ void InspIRCd::ProcessColors(file_cache& input) } /* true for valid channel name, false else */ -bool IsChannelHandler::Call(const std::string& chname, size_t max) +bool IsChannelHandler::Call(const std::string& chname) { - if (chname.empty() || chname.length() > max) + if (chname.empty() || chname.length() > ServerInstance->Config->Limits.ChanMax) return false; if (chname[0] != '#') @@ -265,9 +265,9 @@ bool IsChannelHandler::Call(const std::string& chname, size_t max) } /* true for valid nickname, false else */ -bool IsNickHandler::Call(const std::string& n, size_t max) +bool IsNickHandler::Call(const std::string& n) { - if (n.empty() || n.length() > max) + if (n.empty() || n.length() > ServerInstance->Config->Limits.NickMax) return false; for (std::string::const_iterator i = n.begin(); i != n.end(); ++i) -- cgit v1.2.3