Destroy Memberships of a quitting user in QuitUser() instead of in cull()

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 1cadc49eba764cc398dc2d44f2b4615aa2b253a6..6a831bb049bcdf67ef89a6285deed3febe9dbdef 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -32,23 +32,6 @@
 #include "exitcodes.h"
 #include <iostream>
 
-std::string InspIRCd::GetServerDescription(const std::string& servername)
-{
-       std::string description;
-
-       FOREACH_MOD(OnGetServerDescription, (servername,description));
-
-       if (!description.empty())
-       {
-               return description;
-       }
-       else
-       {
-               // not a remote server that can be found, it must be me.
-               return Config->ServerDesc;
-       }
-}
-
 /* Find a user record by nickname and return a pointer to it */
 User* InspIRCd::FindNick(const std::string &nick)
 {
@@ -337,7 +320,7 @@ void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::str
        FIRST_MOD_RESULT(OnWhoisLine, MOD_RESULT, (user, dest, numeric, copy_text));
 
        if (MOD_RESULT != MOD_RES_DENY)
-               user->WriteServ("%d %s", numeric, copy_text.c_str());
+               user->WriteNumeric(numeric, copy_text);
 }
 
 void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...)
@@ -400,15 +383,17 @@ const char* InspIRCd::Format(va_list &vaList, const char* formatString)
                va_copy(dst, vaList);
 
                int vsnret = vsnprintf(&formatBuffer[0], formatBuffer.size(), formatString, dst);
+               va_end(dst);
+
                if (vsnret > 0 && static_cast<unsigned>(vsnret) < formatBuffer.size())
                {
-                       return &formatBuffer[0];
+                       break;
                }
 
                formatBuffer.resize(formatBuffer.size() * 2);
        }
 
-       throw CoreException();
+       return &formatBuffer[0];
 }
 
 const char* InspIRCd::Format(const char* formatString, ...)
@@ -418,23 +403,6 @@ const char* InspIRCd::Format(const char* formatString, ...)
        return ret;
 }
 
-bool InspIRCd::ULine(const std::string& sserver)
-{
-       if (sserver.empty())
-               return true;
-
-       return (Config->ulines.find(sserver.c_str()) != Config->ulines.end());
-}
-
-bool InspIRCd::SilentULine(const std::string& sserver)
-{
-       std::map<irc::string,bool>::iterator n = Config->ulines.find(sserver.c_str());
-       if (n != Config->ulines.end())
-               return n->second;
-       else
-               return false;
-}
-
 std::string InspIRCd::TimeString(time_t curtime)
 {
 #ifdef _WIN32