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

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

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 8ae88e75245f8f38b844df645da8852e19842049..8e9f4dfd5c8c6289d732f6b60a97f19f38e28cfd 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -324,7 +324,9 @@ bool InspIRCd::OpenLog(char**, int)
                return false;
        }
 
-       FileLogStream *f = new FileLogStream(this, Config->LogLevel, Config->log_file);
+       FileWriter* fw = new FileWriter(this, Config->log_file);
+       FileLogStream *f = new FileLogStream(this, Config->LogLevel, fw);
+
        this->Logs->AddLogType("*", f);
        return true;
 }
@@ -414,19 +416,19 @@ long InspIRCd::Duration(const std::string &str)
        return total + subtotal;
 }
 
-bool InspIRCd::ULine(const char* server)
+bool InspIRCd::ULine(const char* sserver)
 {
-       if (!server)
+       if (!sserver)
                return false;
-       if (!*server)
+       if (!*sserver)
                return true;
 
-       return (Config->ulines.find(server) != Config->ulines.end());
+       return (Config->ulines.find(sserver) != Config->ulines.end());
 }
 
-bool InspIRCd::SilentULine(const char* server)
+bool InspIRCd::SilentULine(const char* sserver)
 {
-       std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
+       std::map<irc::string,bool>::iterator n = Config->ulines.find(sserver);
        if (n != Config->ulines.end())
                return n->second;
        else return false;