Move some local-only fields to LocalUser

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 7e4e0ec6869d67b561df3763eb5162430cd885a0..a0eb9e19ea643bf797b333df9c31b5a5d4332476 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -480,7 +480,7 @@ void ModuleManager::DoSafeUnload(Module* mod)
                mod->OnCleanup(TYPE_USER,u->second);
                u->second->doUnhookExtensions(items);
        }
-       for(char m='A'; m < 'z'; m++)
+       for(char m='A'; m <= 'z'; m++)
        {
                ModeHandler* mh;
                mh = ServerInstance->Modes->FindMode(m, MODETYPE_USER);
@@ -784,54 +784,6 @@ void InspIRCd::SendMode(const std::vector<std::string>& parameters, User *user)
        this->Modes->Process(parameters, user);
 }
 
-void InspIRCd::DumpText(User* user, const std::string &text)
-{
-       if (IS_LOCAL(user))
-       {
-               user->Write(text);
-       }
-       else
-       {
-               PI->PushToClient(user, text);
-       }
-}
-
-void InspIRCd::DumpText(User* user, const char *text, ...)
-{
-       va_list argsPtr;
-       char line[MAXBUF];
-
-       va_start(argsPtr, text);
-       vsnprintf(line, MAXBUF, text, argsPtr);
-       va_end(argsPtr);
-
-       DumpText(user, std::string(line));
-}
-
-void InspIRCd::DumpText(User* user, const std::string &LinePrefix, std::stringstream &TextStream)
-{
-       char line[MAXBUF];
-       int start_pos = LinePrefix.length();
-       int pos = start_pos;
-       memcpy(line, LinePrefix.data(), pos);
-       std::string Word;
-       while (TextStream >> Word)
-       {
-               int len = Word.length();
-               if (pos + len + 12 > MAXBUF)
-               {
-                       line[pos] = '\0';
-                       DumpText(user, std::string(line));
-                       pos = start_pos;
-               }
-               line[pos] = ' ';
-               memcpy(line + pos + 1, Word.data(), len);
-               pos += len + 1;
-       }
-       line[pos] = '\0';
-       DumpText(user, std::string(line));
-}
-
 bool InspIRCd::AddResolver(Resolver* r, bool cached)
 {
        if (!cached)