Convert GenRandom to std::function.

[user/henk/code/inspircd.git] / src / helperfuncs.cpp

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 7e992c4a6dc7898318b2302f454f637c47fd71e1..b80a3897c49abc12fc82f57be648bb14f07875ed 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -193,7 +193,7 @@ void InspIRCd::ProcessColors(file_cache& input)
 }
 
 /* true for valid channel name, false else */
-bool IsChannelHandler::Call(const std::string& chname)
+bool InspIRCd::DefaultIsChannel(const std::string& chname)
 {
        if (chname.empty() || chname.length() > ServerInstance->Config->Limits.ChanMax)
                return false;
@@ -216,7 +216,7 @@ bool IsChannelHandler::Call(const std::string& chname)
 }
 
 /* true for valid nickname, false else */
-bool IsNickHandler::Call(const std::string& n)
+bool InspIRCd::DefaultIsNick(const std::string& n)
 {
        if (n.empty() || n.length() > ServerInstance->Config->Limits.NickMax)
                return false;
@@ -243,7 +243,7 @@ bool IsNickHandler::Call(const std::string& n)
 }
 
 /* return true for good ident, false else */
-bool IsIdentHandler::Call(const std::string& n)
+bool InspIRCd::DefaultIsIdent(const std::string& n)
 {
        if (n.empty())
                return false;
@@ -393,13 +393,13 @@ std::string InspIRCd::TimeString(time_t curtime, const char* format, bool utc)
        return buffer;
 }
 
-std::string InspIRCd::GenRandomStr(int length, bool printable)
+std::string InspIRCd::GenRandomStr(unsigned int length, bool printable)
 {
        char* buf = new char[length];
        GenRandom(buf, length);
        std::string rv;
        rv.resize(length);
-       for(int i=0; i < length; i++)
+       for(size_t i = 0; i < length; i++)
                rv[i] = printable ? 0x3F + (buf[i] & 0x3F) : buf[i];
        delete[] buf;
        return rv;
@@ -415,7 +415,7 @@ unsigned long InspIRCd::GenRandomInt(unsigned long max)
 }
 
 // This is overridden by a higher-quality algorithm when SSL support is loaded
-void GenRandomHandler::Call(char *output, size_t max)
+void InspIRCd::DefaultGenRandom(char* output, size_t max)
 {
        for(unsigned int i=0; i < max; i++)
 #ifdef _WIN32