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

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

diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index ced9bfd93d7e2105fcb438909134e06718b14f08..020095f7c879f6e5dbac407c3aacbc47080ef250 100644 (file)
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -30,7 +30,7 @@ class ModuleXLineDB : public Module
        bool dirty;
        std::string xlinedbpath;
  public:
-       void init()
+       void init() CXX11_OVERRIDE
        {
                /* Load the configuration
                 * Note:
@@ -54,7 +54,7 @@ class ModuleXLineDB : public Module
         * @param source The sender of the line or NULL for local server
         * @param line The xline being added
         */
-       void OnAddLine(User* source, XLine* line)
+       void OnAddLine(User* source, XLine* line) CXX11_OVERRIDE
        {
                dirty = true;
        }
@@ -64,17 +64,17 @@ class ModuleXLineDB : public Module
         * @param source The user removing the line or NULL for local server
         * @param line the line being deleted
         */
-       void OnDelLine(User* source, XLine* line)
+       void OnDelLine(User* source, XLine* line) CXX11_OVERRIDE
        {
                dirty = true;
        }
 
-       void OnExpireLine(XLine *line)
+       void OnExpireLine(XLine *line) CXX11_OVERRIDE
        {
                dirty = true;
        }
 
-       void OnBackgroundTimer(time_t now)
+       void OnBackgroundTimer(time_t now) CXX11_OVERRIDE
        {
                if (dirty)
                {
@@ -93,17 +93,17 @@ class ModuleXLineDB : public Module
                 * Technically, that means that this can block, but I have *never* seen that.
                 *              -- w00t
                 */
-               ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opening temporary database");
+               ServerInstance->Logs->Log("m_xline_db",LOG_DEBUG, "xlinedb: Opening temporary database");
                std::string xlinenewdbpath = xlinedbpath + ".new";
                f = fopen(xlinenewdbpath.c_str(), "w");
                if (!f)
                {
-                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno);
+                       ServerInstance->Logs->Log("m_xline_db",LOG_DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno);
                        ServerInstance->SNO->WriteToSnoMask('a', "database: cannot create new db: %s (%d)", strerror(errno), errno);
                        return false;
                }
 
-               ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opened. Writing..");
+               ServerInstance->Logs->Log("m_xline_db",LOG_DEBUG, "xlinedb: Opened. Writing..");
 
                /*
                 * Now, much as I hate writing semi-unportable formats, additional
@@ -130,14 +130,14 @@ class ModuleXLineDB : public Module
                        }
                }
 
-               ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Finished writing XLines. Checking for error..");
+               ServerInstance->Logs->Log("m_xline_db",LOG_DEBUG, "xlinedb: Finished writing XLines. Checking for error..");
 
                int write_error = 0;
                write_error = ferror(f);
                write_error |= fclose(f);
                if (write_error)
                {
-                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot write to new database! %s (%d)", strerror(errno), errno);
+                       ServerInstance->Logs->Log("m_xline_db",LOG_DEBUG, "xlinedb: Cannot write to new database! %s (%d)", strerror(errno), errno);
                        ServerInstance->SNO->WriteToSnoMask('a', "database: cannot write to new db: %s (%d)", strerror(errno), errno);
                        return false;
                }
@@ -145,7 +145,7 @@ class ModuleXLineDB : public Module
 #ifdef _WIN32
                if (remove(xlinedbpath.c_str()))
                {
-                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot remove old database! %s (%d)", strerror(errno), errno);
+                       ServerInstance->Logs->Log("m_xline_db",LOG_DEBUG, "xlinedb: Cannot remove old database! %s (%d)", strerror(errno), errno);
                        ServerInstance->SNO->WriteToSnoMask('a', "database: cannot remove old database: %s (%d)", strerror(errno), errno);
                        return false;
                }
@@ -153,7 +153,7 @@ class ModuleXLineDB : public Module
                // Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash.
                if (rename(xlinenewdbpath.c_str(), xlinedbpath.c_str()) < 0)
                {
-                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot move new to old database! %s (%d)", strerror(errno), errno);
+                       ServerInstance->Logs->Log("m_xline_db",LOG_DEBUG, "xlinedb: Cannot move new to old database! %s (%d)", strerror(errno), errno);
                        ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno);
                        return false;
                }
@@ -177,7 +177,7 @@ class ModuleXLineDB : public Module
                        else
                        {
                                /* this might be slightly more problematic. */
-                               ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot read database! %s (%d)", strerror(errno), errno);
+                               ServerInstance->Logs->Log("m_xline_db",LOG_DEBUG, "xlinedb: Cannot read database! %s (%d)", strerror(errno), errno);
                                ServerInstance->SNO->WriteToSnoMask('a', "database: cannot read db: %s (%d)", strerror(errno), errno);
                                return false;
                        }
@@ -209,18 +209,18 @@ class ModuleXLineDB : public Module
                                items++;
                        }
 
-                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Processing %s", linebuf);
+                       ServerInstance->Logs->Log("m_xline_db",LOG_DEBUG, "xlinedb: Processing %s", linebuf);
 
                        if (command_p[0] == "VERSION")
                        {
                                if (command_p[1] == "1")
                                {
-                                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Reading db version %s", command_p[1].c_str());
+                                       ServerInstance->Logs->Log("m_xline_db",LOG_DEBUG, "xlinedb: Reading db version %s", command_p[1].c_str());
                                }
                                else
                                {
                                        fclose(f);
-                                       ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: I got database version %s - I don't understand it", command_p[1].c_str());
+                                       ServerInstance->Logs->Log("m_xline_db",LOG_DEBUG, "xlinedb: I got database version %s - I don't understand it", command_p[1].c_str());
                                        ServerInstance->SNO->WriteToSnoMask('a', "database: I got a database version (%s) I don't understand", command_p[1].c_str());
                                        return false;
                                }
@@ -252,7 +252,7 @@ class ModuleXLineDB : public Module
                return true;
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Keeps a dynamic log of all XLines created, and stores them in a separate conf file (xline.db).", VF_VENDOR);
        }