Fix warning, remove unused var

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index b75a91715c8ffeb613f4ab17d8b97d960402565e..8f9bb4589f39543bc88f383ab7deba9169e0fec0 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -41,8 +41,6 @@ InspIRCd* SI = NULL;
 
 void InspIRCd::AddServerName(const std::string &servername)
 {
-       this->Log(DEBUG,"Adding server name: %s",servername.c_str());
-       
        if(find(servernames.begin(), servernames.end(), servername) == servernames.end())
                servernames.push_back(servername); /* Wasn't already there. */
 }
@@ -50,9 +48,9 @@ void InspIRCd::AddServerName(const std::string &servername)
 const char* InspIRCd::FindServerNamePtr(const std::string &servername)
 {
        servernamelist::iterator iter = find(servernames.begin(), servernames.end(), servername);
-       
+
        if(iter == servernames.end())
-       {               
+       {
                AddServerName(servername);
                iter = --servernames.end();
        }
@@ -250,7 +248,7 @@ void InspIRCd::WritePID(const std::string &filename)
                        /* Leaves us with just the path */
                        fname = confpath.substr(0, pos) + std::string("/") + fname;
                }
-       }                                                                       
+       }
        std::ofstream outfile(fname.c_str());
        if (outfile.is_open())
        {
@@ -271,7 +269,7 @@ std::string InspIRCd::GetRevision()
 }
 
 InspIRCd::InspIRCd(int argc, char** argv)
-       : ModCount(-1), duration_m(60), duration_h(60*60), duration_d(60*60*24), duration_w(60*60*24*7), duration_y(60*60*24*365)
+       : ModCount(-1), duration_m(60), duration_h(60*60), duration_d(60*60*24), duration_w(60*60*24*7), duration_y(60*60*24*365), GlobalCulls(this)
 {
        int found_ports = 0;
        FailedPortList pl;
@@ -355,7 +353,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        Config->Read(true, NULL);
        this->CheckRoot();
        this->Modes = new ModeParser(this);
-       this->AddServerName(Config->ServerName);        
+       this->AddServerName(Config->ServerName);
        CheckDie();
        InitializeDisabledCommands(Config->DisabledCommands, this);
        stats->BoundPortCount = BindPorts(true, found_ports, pl);
@@ -394,7 +392,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
                Exit(EXIT_STATUS_BIND);
        }
-       
+
        if (stats->BoundPortCount != (unsigned int)found_ports)
        {
                printf("\nWARNING: Not all your client ports could be bound --\nstarting anyway with %ld of %d client ports bound.\n\n", stats->BoundPortCount, found_ports);
@@ -409,10 +407,8 @@ InspIRCd::InspIRCd(int argc, char** argv)
        /* Add the listening sockets used for client inbound connections
         * to the socket engine
         */
-       this->Log(DEBUG,"%d listeners",stats->BoundPortCount);
        for (unsigned long count = 0; count < stats->BoundPortCount; count++)
        {
-               this->Log(DEBUG,"Add listener: %d",Config->openSockfd[count]->GetFd());
                if (!SE->AddFd(Config->openSockfd[count]))
                {
                        printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n");
@@ -444,7 +440,7 @@ std::string InspIRCd::GetVersionString()
        }
        else
        {
-               snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%lu,%s,%s]",VERSION,Config->ServerName,SYSTEM,(unsigned long)OPTIMISATION,SE->GetName().c_str(),dnsengine);
+               snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),dnsengine);
        }
        return versiondata;
 }
@@ -531,10 +527,6 @@ void InspIRCd::MoveTo(std::string modulename,int slot)
                        Config->implement_lists[slot][n] = x;
                }
        }
-       else
-       {
-               this->Log(DEBUG,"Move of %s to slot failed!",modulename.c_str());
-       }
 }
 
 void InspIRCd::MoveAfter(std::string modulename, std::string after)
@@ -700,8 +692,6 @@ bool InspIRCd::LoadModule(const char* filename)
                snprintf(MODERR,MAXBUF,"Module %s is not within the modules directory.",modfile);
                return false;
        }
-       this->Log(DEBUG,"Loading module: %s",modfile);
-
        if (ServerConfig::FileExists(modfile))
        {
 
@@ -853,10 +843,14 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
         * file descriptors. The socket engine has everything's
         * descriptors in its list... dns, modules, users,
         * servers... so its nice and easy, just one call.
-        * This will cause any read or write events to be 
+        * This will cause any read or write events to be
         * dispatched to their handlers.
         */
        SE->DispatchEvents();
+
+       /* if any users was quit, take them out */
+       GlobalCulls.Apply();
+
 }
 
 bool InspIRCd::IsIdent(const char* n)