diff --git a/mgmt/config/FileManager.cc b/mgmt/config/FileManager.cc index bf6a48b5268..880af8c4db7 100644 --- a/mgmt/config/FileManager.cc +++ b/mgmt/config/FileManager.cc @@ -368,29 +368,23 @@ FileManager::ConfigManager::ConfigManager(const char *fileName_, const char *con } // Copy the file name. - fileName = ats_strdup(fileName_); - configName = ats_strdup(configName_); + fileName = std::string(fileName_); + configName = std::string(configName_); ink_mutex_init(&fileAccessLock); // Check to make sure that our configuration file exists // if (statFile(&fileInfo) < 0) { - Debug(logTag, "%s Unable to load: %s", fileName, strerror(errno)); + Debug(logTag, "%s Unable to load: %s", fileName.c_str(), strerror(errno)); if (isRequired) { - Debug(logTag, " Unable to open required configuration file %s\n\t failed :%s", fileName, strerror(errno)); + Debug(logTag, " Unable to open required configuration file %s\n\t failed :%s", fileName.c_str(), strerror(errno)); } } else { fileLastModified = TS_ARCHIVE_STAT_MTIME(fileInfo); } } -FileManager::ConfigManager::~ConfigManager() -{ - ats_free(fileName); - ats_free(configName); -} - // // // int ConfigManager::statFile() @@ -431,7 +425,7 @@ FileManager::ConfigManager::checkForUserUpdate(FileManager::RollBackCheckType ho fileLastModified = TS_ARCHIVE_STAT_MTIME(fileInfo); // TODO: syslog???? } - Debug(logTag, "User has changed config file %s\n", fileName); + Debug(logTag, "User has changed config file %s\n", fileName.c_str()); result = true; } else { result = false; diff --git a/mgmt/config/FileManager.h b/mgmt/config/FileManager.h index ce558098a8a..15ad43b274e 100644 --- a/mgmt/config/FileManager.h +++ b/mgmt/config/FileManager.h @@ -51,7 +51,6 @@ class FileManager // fileName_ should be rooted or a base file name. ConfigManager(const char *fileName_, const char *configName_, bool root_access_needed, bool isRequired_, ConfigManager *parentConfig_); - ~ConfigManager(); // Manual take out of lock required void @@ -73,13 +72,13 @@ class FileManager const char * getFileName() const { - return fileName; + return fileName.c_str(); } const char * getConfigName() const { - return configName; + return configName.c_str(); } bool @@ -114,8 +113,8 @@ class FileManager int statFile(struct stat *buf); ink_mutex fileAccessLock; - char *fileName; - char *configName; + std::string fileName; + std::string configName; bool root_access_needed; bool isRequired; ConfigManager *parentConfig;