Remove InspIRCd::WriteOpers in favour of snomask O

[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 e6493275123c099573d4982bc1401c2a6c722421..0720f8c939f968f91bd30dc2d21b98e4ec0d4784 100644 (file)
--- a/src/modules/extra/m_sqlite3.cpp
+++ b/src/modules/extra/m_sqlite3.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,24 +11,19 @@
  * ---------------------------------------------------
  */
 
-#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"
 
 /* $ModDesc: sqlite3 provider */
-/* $CompileFlags: pkgconfversion("sqlite3","3.4") pkgconfincludes("sqlite3","/sqlite3.h","") */
+/* $CompileFlags: pkgconfversion("sqlite3","3.3") pkgconfincludes("sqlite3","/sqlite3.h","") */
 /* $LinkerFlags: pkgconflibs("sqlite3","/libsqlite3.so","-lsqlite3") */
 /* $ModDep: m_sqlv2.h */
-
+/* $NoPedantic */
 
 class SQLConn;
 class SQLite3Result;
@@ -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,9 @@ class ModuleSQLite3 : public Module
 
                ReadConf();
 
-               ServerInstance->PublishInterface("SQL", this);
+               ServerInstance->Modules->PublishInterface("SQL", this);
+               Implementation eventlist[] = { I_OnRequest, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual ~ModuleSQLite3()
@@ -496,15 +493,11 @@ 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)
-       {
-               List[I_OnRequest] = List[I_OnRehash] = 1;
-       }
 
        void SendQueue()
        {
@@ -597,7 +590,7 @@ class ModuleSQLite3 : public Module
                {
                        if (!HostInConf(iter->second->GetConfHost()))
                        {
-                               DELETE(iter->second);
+                               delete iter->second;
                                safei = iter;
                                --iter;
                                connections.erase(safei);
@@ -611,11 +604,11 @@ class ModuleSQLite3 : public Module
                while ((i = connections.begin()) != connections.end())
                {
                        connections.erase(i);
-                       DELETE(i->second);
+                       delete i->second;
                }
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                ReadConf();
        }
@@ -661,24 +654,5 @@ void ResultNotifier::Dispatch()
        ((ModuleSQLite3*)mod)->SendQueue();
 }
 
-class ModuleSQLite3Factory : public ModuleFactory
-{
-  public:
-       ModuleSQLite3Factory()
-       {
-       }
-
-       ~ModuleSQLite3Factory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSQLite3(Me);
-       }
-};
+MODULE_INIT(ModuleSQLite3)
 
-extern "C" void * init_module( void )
-{
-       return new ModuleSQLite3Factory;
-}