Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler

2 files changed, 28 insertions, 30 deletions

diff --git a/src/server/shared/Logging/AppenderFile.cpp b/src/server/shared/Logging/AppenderFile.cpp
index 5a8d610a36b..c9cc1935c7a 100644
--- a/src/server/shared/Logging/AppenderFile.cpp
+++ b/src/server/shared/Logging/AppenderFile.cpp
@@ -22,20 +22,19 @@
 # include <Windows.h>
 #endif
 
-AppenderFile::AppenderFile(uint8 id, std::string const& name, LogLevel level, const char* _filename, const char* _logDir, const char* _mode, AppenderFlags _flags, uint64 fileSize):
-    Appender(id, name, APPENDER_FILE, level, _flags),
+AppenderFile::AppenderFile(uint8 id, std::string const& name, LogLevel level, const char* filename, const char* logDir, const char* mode, AppenderFlags flags, uint64 fileSize):
+    Appender(id, name, APPENDER_FILE, level, flags),
     logfile(NULL),
-    filename(_filename),
-    logDir(_logDir),
-    mode(_mode),
-    maxFileSize(fileSize),
-    fileSize(0)
+    _fileName(filename),
+    _logDir(logDir),
+    _maxFileSize(fileSize),
+    _fileSize(0)
 {
-    dynamicName = std::string::npos != filename.find("%s");
-    backup = (_flags & APPENDER_FLAGS_MAKE_FILE_BACKUP) != 0;
+    _dynamicName = std::string::npos != _fileName.find("%s");
+    _backup = (flags & APPENDER_FLAGS_MAKE_FILE_BACKUP) != 0;
 
-    if (!dynamicName)
-        logfile = OpenFile(_filename, _mode, mode == "w" && backup);
+    if (!_dynamicName)
+        logfile = OpenFile(filename, mode, !strcmp(mode, "w") && _backup);
 }
 
 AppenderFile::~AppenderFile()
@@ -45,36 +44,36 @@ AppenderFile::~AppenderFile()
 
 void AppenderFile::_write(LogMessage const* message)
 {
-    bool exceedMaxSize = maxFileSize > 0 && (fileSize.load() + message->Size()) > maxFileSize;
+    bool exceedMaxSize = _maxFileSize > 0 && (_fileSize.load() + message->Size()) > _maxFileSize;
 
-    if (dynamicName)
+    if (_dynamicName)
     {
         char namebuf[TRINITY_PATH_MAX];
-        snprintf(namebuf, TRINITY_PATH_MAX, filename.c_str(), message->param1.c_str());
+        snprintf(namebuf, TRINITY_PATH_MAX, _fileName.c_str(), message->param1.c_str());
         // always use "a" with dynamic name otherwise it could delete the log we wrote in last _write() call
-        FILE* file = OpenFile(namebuf, "a", backup || exceedMaxSize);
+        FILE* file = OpenFile(namebuf, "a", _backup || exceedMaxSize);
         if (!file)
             return;
         fprintf(file, "%s%s\n", message->prefix.c_str(), message->text.c_str());
         fflush(file);
-        fileSize += uint64(message->Size());
+        _fileSize += uint64(message->Size());
         fclose(file);
         return;
     }
     else if (exceedMaxSize)
-        logfile = OpenFile(filename, "w", true);
+        logfile = OpenFile(_fileName, "w", true);
 
     if (!logfile)
         return;
 
     fprintf(logfile, "%s%s\n", message->prefix.c_str(), message->text.c_str());
     fflush(logfile);
-    fileSize += uint64(message->Size());
+    _fileSize += uint64(message->Size());
 }
 
-FILE* AppenderFile::OpenFile(std::string const &filename, std::string const &mode, bool backup)
+FILE* AppenderFile::OpenFile(std::string const& filename, std::string const& mode, bool backup)
 {
-    std::string fullName(logDir + filename);
+    std::string fullName(_logDir + filename);
     if (backup)
     {
         CloseFile();
@@ -87,7 +86,7 @@ FILE* AppenderFile::OpenFile(std::string const &filename, std::string const &mod
 
     if (FILE* ret = fopen(fullName.c_str(), mode.c_str()))
     {
-        fileSize = ftell(ret);
+        _fileSize = ftell(ret);
         return ret;
     }
 
diff --git a/src/server/shared/Logging/AppenderFile.h b/src/server/shared/Logging/AppenderFile.h
index 36afdd23ad1..4082b34a2b4 100644
--- a/src/server/shared/Logging/AppenderFile.h
+++ b/src/server/shared/Logging/AppenderFile.h
@@ -24,21 +24,20 @@
 class AppenderFile: public Appender
 {
     public:
-        AppenderFile(uint8 _id, std::string const& _name, LogLevel level, const char* filename, const char* logDir, const char* mode, AppenderFlags flags, uint64 maxSize);
+        AppenderFile(uint8 id, std::string const& name, LogLevel level, const char* filename, const char* logDir, const char* mode, AppenderFlags flags, uint64 maxSize);
         ~AppenderFile();
-        FILE* OpenFile(std::string const& _name, std::string const& _mode, bool _backup);
+        FILE* OpenFile(std::string const& name, std::string const& mode, bool backup);
 
     private:
         void CloseFile();
         void _write(LogMessage const* message) override;
         FILE* logfile;
-        std::string filename;
-        std::string logDir;
-        std::string mode;
-        bool dynamicName;
-        bool backup;
-        uint64 maxFileSize;
-        std::atomic<uint64> fileSize;
+        std::string _fileName;
+        std::string _logDir;
+        bool _dynamicName;
+        bool _backup;
+        uint64 _maxFileSize;
+        std::atomic<uint64> _fileSize;
 };
 
 #endif