Fix memory leaks on reloadmodule and spanningtree unload while connecting servers

[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 efd6a9c1d2942c40d90a2784df781504c9f922aa..bcb4157d65aff72d455255f76b3094cfac7eff18 100644 (file)
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -22,8 +22,7 @@ class ModuleXLineDB : public Module
        bool reading_db;                        // If this is true, addlines are as a result of db reading, so don't bother flushing the db to disk.
                                                // DO REMEMBER TO SET IT, otherwise it's annoying :P
  public:
-       ModuleXLineDB(InspIRCd* Me) : Module(Me)
-       {
+       ModuleXLineDB()         {
                Implementation eventlist[] = { I_OnAddLine, I_OnDelLine, I_OnExpireLine };
                ServerInstance->Modules->Attach(eventlist, this, 3);
 
@@ -93,7 +92,7 @@ class ModuleXLineDB : public Module
                 *              -- w00t
                 */
                ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opening temporary database");
-               f = fopen("xline.db.new", "w");
+               f = fopen("data/xline.db.new", "w");
                if (!f)
                {
                        ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno);
@@ -118,7 +117,7 @@ class ModuleXLineDB : public Module
                {
                        line = (*i);
                        fprintf(f, "LINE %s %s %s %lu %lu :%s\n", line->type.c_str(), line->Displayable(),
-                               ServerInstance->Config->ServerName, (unsigned long)line->set_time, (unsigned long)line->duration, line->reason.c_str());
+                               ServerInstance->Config->ServerName.c_str(), (unsigned long)line->set_time, (unsigned long)line->duration, line->reason.c_str());
                }
 
                ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Finished writing XLines. Checking for error..");
@@ -134,7 +133,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("xline.db.new", "xline.db") < 0)
+               if (rename("data/xline.db.new", "data/xline.db") < 0)
                {
                        ServerInstance->Logs->Log("m_xline_db",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);
@@ -150,7 +149,7 @@ class ModuleXLineDB : public Module
                char linebuf[MAXBUF];
                unsigned int lineno = 0;
 
-               f = fopen("xline.db", "r");
+               f = fopen("data/xline.db", "r");
                if (!f)
                {
                        if (errno == ENOENT)
@@ -240,7 +239,7 @@ class ModuleXLineDB : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Keeps a dynamic log of all XLines created, and stores them in a seperate conf file (xline.db).", VF_VENDOR, API_VERSION);
+               return Version("Keeps a dynamic log of all XLines created, and stores them in a seperate conf file (xline.db).", VF_VENDOR);
        }
 };