Remove InspIRCd* parameters and fields

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

diff --git a/src/modules/extra/m_mssql.cpp b/src/modules/extra/m_mssql.cpp
index 5fd62f55ee530a2fa3f5e2cac69a29a1fa17f617..8cd9e2ea7a955f103de3376b113a7ea51fa56d52 100644 (file)
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -35,7 +35,7 @@ typedef std::deque<MsSQLResult*> 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;
@@ -51,11 +51,9 @@ class QueryThread : public SocketThread
 {
   private:
        ModuleMsSQL* Parent;
-       InspIRCd* ServerInstance;
   public:
-       QueryThread(InspIRCd* si, ModuleMsSQL* mod)
-       : SocketThread(si), Parent(mod), ServerInstance(si)
-       {
+       QueryThread(ModuleMsSQL* mod)
+       : SocketThread(si), Parent(mod),        {
        }
        ~QueryThread() { }
        virtual void Run();
@@ -232,7 +230,6 @@ class SQLConn : public classbase
 {
  private:
        ResultQueue results;
-       InspIRCd* ServerInstance;
        Module* mod;
        SQLhost host;
        TDSLOGIN* login;
@@ -242,8 +239,8 @@ class SQLConn : public classbase
  public:
        QueryQueue queue;
 
-       SQLConn(InspIRCd* SI, Module* m, const SQLhost& hi)
-       : ServerInstance(SI), mod(m), host(hi), login(NULL), sock(NULL), context(NULL)
+       SQLConn(Module* m, const SQLhost& hi)
+       : mod(m), host(hi), login(NULL), sock(NULL), context(NULL)
        {
                if (OpenDB())
                {
@@ -643,8 +640,8 @@ class ModuleMsSQL : public Module
        QueryThread* queryDispatcher;
 
  public:
-       ModuleMsSQL(InspIRCd* Me)
-       : Module(Me), currid(0)
+       ModuleMsSQL()
+       : currid(0)
        {
                LoggingMutex = new Mutex();
                ResultsMutex = new Mutex();
@@ -658,7 +655,7 @@ class ModuleMsSQL : public Module
 
                ReadConf();
 
-               queryDispatcher = new QueryThread(ServerInstance, this);
+               queryDispatcher = new QueryThread(this);
                ServerInstance->Threads->Start(queryDispatcher);
 
                ServerInstance->Modules->PublishInterface("SQL", this);
@@ -668,6 +665,7 @@ class ModuleMsSQL : public Module
 
        virtual ~ModuleMsSQL()
        {
+               queryDispatcher->join();
                delete queryDispatcher;
                ClearQueue();
                ClearAllConnections();
@@ -708,7 +706,7 @@ class ModuleMsSQL : public Module
 
        bool HostInConf(const SQLhost &h)
        {
-               ConfigReader conf(ServerInstance);
+               ConfigReader conf;
                for(int i = 0; i < conf.Enumerate("database"); i++)
                {
                        SQLhost host;
@@ -728,7 +726,7 @@ class ModuleMsSQL : public Module
        {
                ClearOldConnections();
 
-               ConfigReader conf(ServerInstance);
+               ConfigReader conf;
                for(int i = 0; i < conf.Enumerate("database"); i++)
                {
                        SQLhost host;
@@ -759,7 +757,7 @@ class ModuleMsSQL : public Module
 
                SQLConn* newconn;
 
-               newconn = new SQLConn(ServerInstance, this, hi);
+               newconn = new SQLConn(this, hi);
 
                connections.insert(std::make_pair(hi.id, newconn));
        }
@@ -836,7 +834,7 @@ class ModuleMsSQL : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+               return Version("MsSQL provider", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
        }
 
 };