#define NO_CLIENT_LONG_LONG, makes mysql.h ANSI C++ compliant so that we can get...

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 28eeec7c27530eda8cf5cc7212476cd0f86e0de2..617d5a0fa64de280d5cdb6065e66312a9112c1c1 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -114,7 +114,7 @@ void                Module::OnPostJoin(User*, Channel*) { }
 void           Module::OnUserPart(User*, Channel*, const std::string&, bool&) { }
 void           Module::OnRehash(User*, const std::string&) { }
 void           Module::OnServerRaw(std::string&, bool, User*) { }
-int            Module::OnUserPreJoin(User*, Channel*, const char*, std::string&) { return 0; }
+int            Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; }
 void           Module::OnMode(User*, void*, int, const std::string&) { }
 Version                Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); }
 void           Module::OnOper(User*, const std::string&) { }
@@ -356,7 +356,7 @@ bool ModuleManager::Load(const char* filename)
                {
                        /* Try and locate and load all modules matching the pattern */
                        dirent* entry = NULL;
-                       while ((entry = readdir(library)))
+                       while (0 != (entry = readdir(library)))
                        {
                                if (Instance->MatchText(entry->d_name, filename))
                                {
@@ -602,14 +602,12 @@ bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* M
                modulelist ml;
                ml.push_back(Mod);
                Interfaces[InterfaceName] = std::make_pair(0, ml);
-               return true;
        }
        else
        {
                iter->second.second.push_back(Mod);
-               return true;
        }
-       return false;
+       return true;
 }
 
 bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod)