Remove unneeded ProtocolInterface::Introduce

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

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 824a75e46769603914dd590346dfd80ef46e565c..06c2a13b6c7e14291f6d9e81e3a3c8d0941c5cee 100644 (file)
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -73,7 +73,7 @@ typedef std::deque<SQLresult*> ResultQueue;
 unsigned long count(const char * const str, char a)
 {
        unsigned long n = 0;
-       for (const char *p = reinterpret_cast<const char *>(str); *p; ++p)
+       for (const char *p = str; *p; ++p)
        {
                if (*p == '?')
                        ++n;
@@ -101,7 +101,7 @@ class ModuleSQL : public Module
         ~ModuleSQL();
         unsigned long NewID();
         const char* OnRequest(Request* request);
-        void OnRehash(User* user, const std::string &parameter);
+        void OnRehash(User* user);
         Version GetVersion();
 };
 
@@ -682,8 +682,7 @@ ModuleSQL::ModuleSQL(InspIRCd* Me) : Module(Me), rehashing(false)
 
        if (!ServerInstance->Modules->PublishFeature("SQL", this))
        {
-               /* Tell worker thread to exit NOW,
-                * Automatically joins */
+               Dispatcher->join();
                delete Dispatcher;
                ServerInstance->Modules->DoneWithInterface("SQLutils");
                throw ModuleException("m_mysql: Unable to publish feature 'SQL'");
@@ -746,7 +745,7 @@ const char* ModuleSQL::OnRequest(Request* request)
        return NULL;
 }
 
-void ModuleSQL::OnRehash(User* user, const std::string &parameter)
+void ModuleSQL::OnRehash(User* user)
 {
        Dispatcher->LockQueue();
        rehashing = true;