diff options
| -rw-r--r-- | src/OSSupport/File.cpp | 23 | ||||
| -rw-r--r-- | src/OSSupport/File.h | 3 | ||||
| -rw-r--r-- | src/Protocol/Protocol18x.cpp | 4 |
3 files changed, 3 insertions, 27 deletions
diff --git a/src/OSSupport/File.cpp b/src/OSSupport/File.cpp index 1ee9feafe..8957dfaef 100644 --- a/src/OSSupport/File.cpp +++ b/src/OSSupport/File.cpp @@ -453,29 +453,6 @@ AString cFile::ReadWholeFile(const AString & a_FileName) -AString cFile::ReplaceFileNameInvalidChars(const AString & a_FileName, char a_Replacement) -{ - AString res(a_FileName); - for (auto & ch: res) - { - switch (ch) - { - case ':': - case '\\': - case '/': - { - ch = a_Replacement; - break; - } - } - } - return res; -} - - - - - int cFile::Printf(const char * a_Fmt, ...) { AString buf; diff --git a/src/OSSupport/File.h b/src/OSSupport/File.h index b39f71e28..ac6d1ab21 100644 --- a/src/OSSupport/File.h +++ b/src/OSSupport/File.h @@ -127,9 +127,6 @@ public: /** Returns the entire contents of the specified file as a string. Returns empty string on error. */ static AString ReadWholeFile(const AString & a_FileName); - /** Replaces characters that cannot be in a file name with the specified char. */ - static AString ReplaceFileNameInvalidChars(const AString & a_FileName, char a_Replacement = '_'); - // tolua_end /** Returns the list of all items in the specified folder (files, folders, nix pipes, whatever's there). */ diff --git a/src/Protocol/Protocol18x.cpp b/src/Protocol/Protocol18x.cpp index 5d722d9fc..7d954a297 100644 --- a/src/Protocol/Protocol18x.cpp +++ b/src/Protocol/Protocol18x.cpp @@ -108,10 +108,12 @@ cProtocol180::cProtocol180(cClientHandle * a_Client, const AString & a_ServerAdd { static int sCounter = 0; cFile::CreateFolder("CommLogs"); + AString IP(a_Client->GetIPString()); + ReplaceString(IP, ":", "_"); AString FileName = Printf("CommLogs/%x_%d__%s.log", static_cast<unsigned>(time(nullptr)), sCounter++, - cFile::ReplaceFileNameInvalidChars(a_Client->GetIPString()).c_str() + IP.c_str() ); if (!m_CommLogFile.Open(FileName, cFile::fmWrite)) { |