m_spanningtree Remove SpanningTreeUtilities* fields and parameters

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 799e860fbe9c8254a1d5f6d38aa8be01fb434c65..f2095c4a2d17bdd9b5bb1d091a0b4676ebf2670d 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -26,7 +26,6 @@
  */
 
 
-/* $Core */
 #include "inspircd.h"
 #include <signal.h>
 
@@ -208,7 +207,7 @@ void InspIRCd::WritePID(const std::string &filename)
 #ifndef _WIN32
        std::string fname(filename);
        if (fname.empty())
-               fname = DATA_PATH "/inspircd.pid";
+               fname = ServerInstance->Config->Paths.PrependData("inspircd.pid");
        std::ofstream outfile(fname.c_str());
        if (outfile.is_open())
        {
@@ -359,7 +358,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
        if (do_version)
        {
-               std::cout << std::endl << VERSION << " r" << REVISION << std::endl;
+               std::cout << std::endl << VERSION << " " << REVISION << std::endl;
                Exit(EXIT_STATUS_NOERROR);
        }
 
@@ -702,7 +701,7 @@ void InspIRCd::Run()
                        if ((TIME.tv_sec % 3600) == 0)
                        {
                                Users->GarbageCollect();
-                               FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
+                               FOREACH_MOD(OnGarbageCollect, ());
                        }
 
                        Timers->TickTimers(TIME.tv_sec);
@@ -710,7 +709,7 @@ void InspIRCd::Run()
 
                        if ((TIME.tv_sec % 5) == 0)
                        {
-                               FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME.tv_sec));
+                               FOREACH_MOD(OnBackgroundTimer, (TIME.tv_sec));
                                SNO->FlushSnotices();
                        }
                }