Merge pull request #1094 from SISheogorath/insp20+fixed-Override

[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 1c51258053928563b7ac3ae0c2fadb9408fac3ba..2237b0d081e8036217606e7a3c22de29d7b0942e 100644 (file)
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -147,12 +147,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->SNO->WriteToSnoMask('a', "database: cannot remove old database: %s (%d)", strerror(errno), errno);
-                       return false;
-               }
+               remove(xlinedbpath.c_str());
 #endif
                // 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)
@@ -169,7 +164,6 @@ class ModuleXLineDB : public Module
        {
                FILE *f;
                char linebuf[MAXBUF];
-               unsigned int lineno = 0;
 
                f = fopen(xlinedbpath.c_str(), "r");
                if (!f)
@@ -201,16 +195,14 @@ class ModuleXLineDB : public Module
 
                                c++;
                        }
-                       // Smart man might think of initing to 1, and moving this to the bottom. Don't. We use continue in this loop.
-                       lineno++;
 
                        // Inspired by the command parser. :)
                        irc::tokenstream tokens(linebuf);
                        int items = 0;
-                       std::string command_p[MAXPARAMETERS];
+                       std::string command_p[7];
                        std::string tmp;
 
-                       while (tokens.GetToken(tmp) && (items < MAXPARAMETERS))
+                       while (tokens.GetToken(tmp) && (items < 7))
                        {
                                command_p[items] = tmp;
                                items++;