Merge pull request #514 from SaberUK/master+virtual-cleanup

[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 3ba3987834ee9672830f96fcafd26fda0b7b354e..51eb9b9ddf51a973f9b81849e55e7b77fbd53db0 100644 (file)
--- a/src/modules/extra/m_mssql.cpp
+++ b/src/modules/extra/m_mssql.cpp
@@ -64,8 +64,8 @@ class QueryThread : public SocketThread
   public:
        QueryThread(ModuleMsSQL* mod) : Parent(mod) { }
        ~QueryThread() { }
-       virtual void Run();
-       virtual void OnNotify();
+       void Run();
+       void OnNotify();
 };
 
 class MsSQLResult : public SQLresult
@@ -107,17 +107,17 @@ class MsSQLResult : public SQLresult
                rows++;
        }
 
-       virtual int Rows()
+       int Rows()
        {
                return rows;
        }
 
-       virtual int Cols()
+       int Cols()
        {
                return cols;
        }
 
-       virtual std::string ColName(int column)
+       std::string ColName(int column)
        {
                if (column < (int)colnames.size())
                {
@@ -130,7 +130,7 @@ class MsSQLResult : public SQLresult
                return "";
        }
 
-       virtual int ColNum(const std::string &column)
+       int ColNum(const std::string &column)
        {
                for (unsigned int i = 0; i < colnames.size(); i++)
                {
@@ -141,7 +141,7 @@ class MsSQLResult : public SQLresult
                return 0;
        }
 
-       virtual SQLfield GetValue(int row, int column)
+       SQLfield GetValue(int row, int column)
        {
                if ((row >= 0) && (row < rows) && (column >= 0) && (column < Cols()))
                {
@@ -154,7 +154,7 @@ class MsSQLResult : public SQLresult
                return SQLfield("",true);
        }
 
-       virtual SQLfieldList& GetRow()
+       SQLfieldList& GetRow()
        {
                if (currentrow < rows)
                        return fieldlists[currentrow];
@@ -162,7 +162,7 @@ class MsSQLResult : public SQLresult
                        return emptyfieldlist;
        }
 
-       virtual SQLfieldMap& GetRowMap()
+       SQLfieldMap& GetRowMap()
        {
                /* In an effort to reduce overhead we don't actually allocate the map
                 * until the first time it's needed...so...
@@ -188,7 +188,7 @@ class MsSQLResult : public SQLresult
                return *fieldmap;
        }
 
-       virtual SQLfieldList* GetRowPtr()
+       SQLfieldList* GetRowPtr()
        {
                fieldlist = new SQLfieldList();
 
@@ -203,7 +203,7 @@ class MsSQLResult : public SQLresult
                return fieldlist;
        }
 
-       virtual SQLfieldMap* GetRowMapPtr()
+       SQLfieldMap* GetRowMapPtr()
        {
                fieldmap = new SQLfieldMap();
 
@@ -219,12 +219,12 @@ class MsSQLResult : public SQLresult
                return fieldmap;
        }
 
-       virtual void Free(SQLfieldMap* fm)
+       void Free(SQLfieldMap* fm)
        {
                delete fm;
        }
 
-       virtual void Free(SQLfieldList* fl)
+       void Free(SQLfieldList* fl)
        {
                delete fl;
        }
@@ -254,7 +254,7 @@ class SQLConn : public classbase
                                if (tds_process_simple_query(sock) != TDS_SUCCEED)
                                {
                                        LoggingMutex->Lock();
-                                       ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
+                                       ServerInstance->Logs->Log("m_mssql",LOG_DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
                                        LoggingMutex->Unlock();
                                        CloseDB();
                                }
@@ -262,7 +262,7 @@ class SQLConn : public classbase
                        else
                        {
                                LoggingMutex->Lock();
-                               ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
+                               ServerInstance->Logs->Log("m_mssql",LOG_DEFAULT, "WARNING: Could not select database " + host.name + " for DB with id: " + host.id);
                                LoggingMutex->Unlock();
                                CloseDB();
                        }
@@ -270,7 +270,7 @@ class SQLConn : public classbase
                else
                {
                        LoggingMutex->Lock();
-                       ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: Could not connect to DB with id: " + host.id);
+                       ServerInstance->Logs->Log("m_mssql",LOG_DEFAULT, "WARNING: Could not connect to DB with id: " + host.id);
                        LoggingMutex->Unlock();
                        CloseDB();
                }
@@ -429,7 +429,7 @@ class SQLConn : public classbase
 
                char* msquery = strdup(req->query.q.data());
                LoggingMutex->Lock();
-               ServerInstance->Logs->Log("m_mssql",DEBUG,"doing Query: %s",msquery);
+               ServerInstance->Logs->Log("m_mssql",LOG_DEBUG,"doing Query: %s",msquery);
                LoggingMutex->Unlock();
                if (tds_submit_query(sock, msquery) != TDS_SUCCEED)
                {
@@ -445,8 +445,8 @@ class SQLConn : public classbase
                int tds_res;
                while (tds_process_tokens(sock, &tds_res, NULL, TDS_TOKEN_RESULTS) == TDS_SUCCEED)
                {
-                       //ServerInstance->Logs->Log("m_mssql",DEBUG,"<******> result type: %d", tds_res);
-                       //ServerInstance->Logs->Log("m_mssql",DEBUG,"AFFECTED ROWS: %d", sock->rows_affected);
+                       //ServerInstance->Logs->Log("m_mssql",LOG_DEBUG,"<******> result type: %d", tds_res);
+                       //ServerInstance->Logs->Log("m_mssql",LOG_DEBUG,"AFFECTED ROWS: %d", sock->rows_affected);
                        switch (tds_res)
                        {
                                case TDS_ROWFMT_RESULT:
@@ -512,7 +512,7 @@ class SQLConn : public classbase
        {
                SQLConn* sc = (SQLConn*)pContext->parent;
                LoggingMutex->Lock();
-               ServerInstance->Logs->Log("m_mssql", DEBUG, "Message for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
+               ServerInstance->Logs->Log("m_mssql", LOG_DEBUG, "Message for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
                LoggingMutex->Unlock();
                return 0;
        }
@@ -521,7 +521,7 @@ class SQLConn : public classbase
        {
                SQLConn* sc = (SQLConn*)pContext->parent;
                LoggingMutex->Lock();
-               ServerInstance->Logs->Log("m_mssql", DEFAULT, "Error for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
+               ServerInstance->Logs->Log("m_mssql", LOG_DEFAULT, "Error for DB with id: %s -> %s", sc->host.id.c_str(), pMessage->message);
                LoggingMutex->Unlock();
                return 0;
        }
@@ -653,7 +653,7 @@ class ModuleMsSQL : public Module
                queryDispatcher = new QueryThread(this);
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ReadConf();
 
@@ -664,7 +664,7 @@ class ModuleMsSQL : public Module
                ServerInstance->Modules->AddService(sqlserv);
        }
 
-       virtual ~ModuleMsSQL()
+       ~ModuleMsSQL()
        {
                queryDispatcher->join();
                delete queryDispatcher;
@@ -749,7 +749,7 @@ class ModuleMsSQL : public Module
                if (HasHost(hi))
                {
                        LoggingMutex->Lock();
-                       ServerInstance->Logs->Log("m_mssql",DEFAULT, "WARNING: A MsSQL connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str());
+                       ServerInstance->Logs->Log("m_mssql",LOG_DEFAULT, "WARNING: A MsSQL connection with id: %s already exists. Aborting database open attempt.", hi.id.c_str());
                        LoggingMutex->Unlock();
                        return;
                }
@@ -783,14 +783,14 @@ class ModuleMsSQL : public Module
                connections.clear();
        }
 
-       virtual void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
                queryDispatcher->LockQueue();
                ReadConf();
                queryDispatcher->UnlockQueueWakeup();
        }
 
-       void OnRequest(Request& request)
+       void OnRequest(Request& request) CXX11_OVERRIDE
        {
                if(strcmp(SQLREQID, request.id) == 0)
                {
@@ -821,7 +821,7 @@ class ModuleMsSQL : public Module
                return ++currid;
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("MsSQL provider", VF_VENDOR);
        }