Removed extremely verbose debugging from the SSL modules, as I believe that bug has...

[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 6605bed3c2f7722de92e2b5f99c1ccc869df27d0..a78e8c61b0a5253067bc8cd08a7bc2df2d1751e2 100644 (file)
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -676,7 +676,7 @@ class Notifier : public InspSocket
                 * The function GetCharId translates a single character
                 * back into an iterator.
                 */
-               if (read(this->GetFd(), &data, 1) > 0)
+               if (Instance->SE->Recv(this, &data, 1, 0) > 0)
                {
                        ConnMap::iterator iter = GetCharId(data);
                        if (iter != Connections.end())
@@ -713,7 +713,7 @@ class ModuleSQL : public Module
        ModuleSQL(InspIRCd* Me)
        : Module::Module(Me), rehashing(false)
        {
-               ServerInstance->UseInterface("SQLutils");
+               ServerInstance->Modules->UseInterface("SQLutils");
 
                Conf = new ConfigReader(ServerInstance);
                PublicServerInstance = ServerInstance;
@@ -730,24 +730,24 @@ class ModuleSQL : public Module
                        throw ModuleException("m_mysql: Failed to create dispatcher thread: " + std::string(strerror(errno)));
                }
 
-               if (!ServerInstance->PublishFeature("SQL", this))
+               if (!ServerInstance->Modules->PublishFeature("SQL", this))
                {
                        /* Tell worker thread to exit NOW */
                        giveup = true;
                        throw ModuleException("m_mysql: Unable to publish feature 'SQL'");
                }
 
-               ServerInstance->PublishInterface("SQL", this);
+               ServerInstance->Modules->PublishInterface("SQL", this);
        }
 
        virtual ~ModuleSQL()
        {
                giveup = true;
                ClearAllConnections();
-               DELETE(Conf);
-               ServerInstance->UnpublishInterface("SQL", this);
-               ServerInstance->UnpublishFeature("SQL");
-               ServerInstance->DoneWithInterface("SQLutils");
+               delete Conf;
+               ServerInstance->Modules->UnpublishInterface("SQL", this);
+               ServerInstance->Modules->UnpublishFeature("SQL");
+               ServerInstance->Modules->DoneWithInterface("SQLutils");
        }
 
 
@@ -886,4 +886,3 @@ void* DispatcherThread(void* arg)
 }
 
 MODULE_INIT(ModuleSQL);
-