]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/extra/m_mysql.cpp
Remove unneeded ProtocolInterface::Introduce
[user/henk/code/inspircd.git] / src / modules / extra / m_mysql.cpp
index 465992d304578da9a7b916ad2e3cdb935970dfd3..06c2a13b6c7e14291f6d9e81e3a3c8d0941c5cee 100644 (file)
@@ -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;
@@ -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'");