Commit patch from danieldg that makes a ton of stuff const-safe for latest warn-happy...

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

diff --git a/src/server.cpp b/src/server.cpp
index 9b6f1609eec66c10081e9ebbd7f2dcdf8979d3f0..191c84ce0bdbe92a5362ebdb35e317942008ad06 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -46,10 +46,10 @@ void InspIRCd::Exit(int status)
 
 void InspIRCd::Rehash()
 {
-       this->SNO->WriteToSnoMask('O', "Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(this->ConfigFileName));
-       this->CloseLog();
+       this->SNO->WriteToSnoMask('A', "Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(this->ConfigFileName));
+       this->Logs->CloseLogs();
        if (!this->OpenLog(this->Config->argv, this->Config->argc))
-               this->SNO->WriteToSnoMask('O', "ERROR: Could not open logfile %s: %s", Config->logpath.c_str(), strerror(errno));
+               this->SNO->WriteToSnoMask('A', "ERROR: Could not open logfile %s: %s", Config->logpath.c_str(), strerror(errno));
        this->RehashUsersAndChans();
        FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
        /*this->Config->Read(false,NULL);*/
@@ -61,7 +61,7 @@ void InspIRCd::Rehash()
 
 void InspIRCd::RehashServer()
 {
-       this->SNO->WriteToSnoMask('O', "Rehashing config file");
+       this->SNO->WriteToSnoMask('A', "Rehashing config file");
        this->RehashUsersAndChans();
        /*this->Config->Read(false,NULL);*/
        this->ResetMaxBans();
@@ -106,7 +106,7 @@ void InspIRCd::AddServerName(const std::string &servername)
                if(**itr == servername)
                        return;
 
-       string * ns = new string(servername);
+       std::string * ns = new std::string(servername);
        servernames.push_back(ns);
 }
 
@@ -117,7 +117,7 @@ const char* InspIRCd::FindServerNamePtr(const std::string &servername)
                if(**itr == servername)
                        return (*itr)->c_str();
 
-       servernames.push_back(new string(servername));
+       servernames.push_back(new std::string(servername));
        itr = --servernames.end();
        return (*itr)->c_str();
 }