/usr/local/include/openssl/pqueue.h:73: error: ISO C++ does not support `long long'

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

diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp
index 9568b97089547f0c9aeb87e3fd1e0b89e19dd7a7..6ba5967f372929d7201c73617285cfbdfac2396e 100644 (file)
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -11,16 +11,11 @@
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <deque>
-#include <map>
+#include "inspircd.h"
 #include <sqlite3.h>
-
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
-#include "configreader.h"
 
 #include "m_sqlv2.h"
 
@@ -41,7 +36,7 @@ typedef std::deque<SQLite3Result*> ResultQueue;
 ResultNotifier* resultnotify = NULL;
 
 
-class ResultNotifier : public InspSocket
+class ResultNotifier : public BufferedSocket
 {
        Module* mod;
        insp_sockaddr sock_us;
@@ -50,9 +45,9 @@ class ResultNotifier : public InspSocket
  public:
        /* Create a socket on a random port. Let the tcp stack allocate us an available port */
 #ifdef IPV6
-       ResultNotifier(InspIRCd* SI, Module* m) : InspSocket(SI, "::1", 0, true, 3000), mod(m)
+       ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "::1", 0, true, 3000), mod(m)
 #else
-       ResultNotifier(InspIRCd* SI, Module* m) : InspSocket(SI, "127.0.0.1", 0, true, 3000), mod(m)
+       ResultNotifier(InspIRCd* SI, Module* m) : BufferedSocket(SI, "127.0.0.1", 0, true, 3000), mod(m)
 #endif
        {
                uslen = sizeof(sock_us);
@@ -62,7 +57,7 @@ class ResultNotifier : public InspSocket
                }
        }
 
-       ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : InspSocket(SI, newfd, ip), mod(m)
+       ResultNotifier(InspIRCd* SI, Module* m, int newfd, char* ip) : BufferedSocket(SI, newfd, ip), mod(m)
        {
        }
 
@@ -371,7 +366,7 @@ class SQLConn : public classbase
        {
                paramlist* p = (paramlist*)params;
                ((SQLConn*)(*p)[0])->AffectedReady(((SQLite3Result*)(*p)[1]));
-       }\r
+       }
 
        void ResultReady(SQLite3Result *res, int cols, char **data, char **colnames)
        {
@@ -473,9 +468,9 @@ class ModuleSQLite3 : public Module
        ModuleSQLite3(InspIRCd* Me)
        : Module::Module(Me), currid(0)
        {
-               ServerInstance->UseInterface("SQLutils");
+               ServerInstance->Modules->UseInterface("SQLutils");
 
-               if (!ServerInstance->PublishFeature("SQL", this))
+               if (!ServerInstance->Modules->PublishFeature("SQL", this))
                {
                        throw ModuleException("m_sqlite3: Unable to publish feature 'SQL'");
                }
@@ -484,7 +479,7 @@ class ModuleSQLite3 : public Module
 
                ReadConf();
 
-               ServerInstance->PublishInterface("SQL", this);
+               ServerInstance->Modules->PublishInterface("SQL", this);
        }
 
        virtual ~ModuleSQLite3()
@@ -496,9 +491,9 @@ class ModuleSQLite3 : public Module
                resultnotify->OnError(I_ERR_SOCKET);
                resultnotify->ClosePending = true;
                delete resultnotify;
-               ServerInstance->UnpublishInterface("SQL", this);
-               ServerInstance->UnpublishFeature("SQL");
-               ServerInstance->DoneWithInterface("SQLutils");
+               ServerInstance->Modules->UnpublishInterface("SQL", this);
+               ServerInstance->Modules->UnpublishFeature("SQL");
+               ServerInstance->Modules->DoneWithInterface("SQLutils");
        }
 
        void Implements(char* List)
@@ -615,7 +610,7 @@ class ModuleSQLite3 : public Module
                }
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                ReadConf();
        }
@@ -661,24 +656,5 @@ void ResultNotifier::Dispatch()
        ((ModuleSQLite3*)mod)->SendQueue();
 }
 
-class ModuleSQLite3Factory : public ModuleFactory
-{
-  public:
-       ModuleSQLite3Factory()
-       {
-       }
+MODULE_INIT(ModuleSQLite3)
 
-       ~ModuleSQLite3Factory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSQLite3(Me);
-       }
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSQLite3Factory;
-}