Merge branch 'master+websocket'

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

diff --git a/src/fileutils.cpp b/src/fileutils.cpp
index ee89cca1c80d9bb9892a739d1d1c797af3da044c..731e4ea01a9dd74268532fc1dee39f54b21e1409 100644 (file)
--- a/src/fileutils.cpp
+++ b/src/fileutils.cpp
@@ -29,14 +29,14 @@ FileReader::FileReader(const std::string& filename)
 void FileReader::Load(const std::string& filename)
 {
        // If the file is stored in the file cache then we used that version instead.
-       std::string realName = ServerInstance->Config->Paths.PrependConfig(filename);
-       ConfigFileCache::iterator it = ServerInstance->Config->Files.find(realName);
+       ConfigFileCache::const_iterator it = ServerInstance->Config->Files.find(filename);
        if (it != ServerInstance->Config->Files.end())
        {
                this->lines = it->second;
        }
        else
        {
+               const std::string realName = ServerInstance->Config->Paths.PrependConfig(filename);
                lines.clear();
 
                std::ifstream stream(realName.c_str());
@@ -91,7 +91,7 @@ std::string FileSystem::GetFileName(const std::string& name)
 #ifdef _WIN32
        size_t pos = name.find_last_of("\\/");
 #else
-       size_t pos = name.rfind('/');   
+       size_t pos = name.rfind('/');
 #endif
        return pos == std::string::npos ? name : name.substr(++pos);
 }