From b38d808f3c9b2db45db7e44feee7ffa14f4aedf2 Mon Sep 17 00:00:00 2001 From: JensHoffmann Date: Sat, 7 Dec 2013 22:21:04 +0100 Subject: [PATCH] Use std::string for log file name in module Log (cherry picked from commit 74414c31b10720458623048a92a19cd31c49e82b) --- include/Log.h | 2 +- src/log/Log.cc | 20 +++++--------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/include/Log.h b/include/Log.h index bd799fe351..5af87440bb 100644 --- a/include/Log.h +++ b/include/Log.h @@ -93,7 +93,7 @@ public: const char * message); private: - char * log_file; + string log_file_name; }; /** diff --git a/src/log/Log.cc b/src/log/Log.cc index 86784f4a80..86cccc20e9 100644 --- a/src/log/Log.cc +++ b/src/log/Log.cc @@ -48,18 +48,14 @@ const char Log::error_names[] ={ 'E', 'W', 'I', 'D' }; FileLog::FileLog(const string& file_name, const MessageType level, ios_base::openmode mode) - :Log(level), log_file(0) + :Log(level), log_file_name(file_name) { - ofstream file; + ofstream file; - log_file = strdup(file_name.c_str()); - - file.open(log_file, mode); + file.open(log_file_name.c_str(), mode); if (file.fail() == true) { - free(log_file); - throw runtime_error("Could not open log file"); } @@ -72,13 +68,7 @@ FileLog::FileLog(const string& file_name, /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ -FileLog::~FileLog() -{ - if ( log_file != 0 ) - { - free(log_file); - } -} +FileLog::~FileLog() { } /* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */ @@ -94,7 +84,7 @@ void FileLog::log( if( type <= log_level) { - file.open(log_file, ios_base::app); + file.open(log_file_name.c_str(), ios_base::app); if (file.fail() == true) {