diff options
author | Andrei Karas <akaras@inbox.ru> | 2017-03-28 20:20:54 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2017-03-28 23:25:13 +0300 |
commit | 75a5173176adfc4bc417c10df137d9ea8d90d403 (patch) | |
tree | 2d095e72f084ff96ee5ce3608453d98da0eda5d7 /src/utils/translation | |
parent | b6831b3b3053b1777402a35d8b3ae3cca2f62bc4 (diff) | |
download | manaverse-75a5173176adfc4bc417c10df137d9ea8d90d403.tar.gz manaverse-75a5173176adfc4bc417c10df137d9ea8d90d403.tar.bz2 manaverse-75a5173176adfc4bc417c10df137d9ea8d90d403.tar.xz manaverse-75a5173176adfc4bc417c10df137d9ea8d90d403.zip |
Change memory allocation in Virtfs::LoadFile from calloc to new.
Diffstat (limited to 'src/utils/translation')
-rw-r--r-- | src/utils/translation/poparser.cpp | 4 | ||||
-rw-r--r-- | src/utils/translation/translationmanager.cpp | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp index a24b62343..ce317f185 100644 --- a/src/utils/translation/poparser.cpp +++ b/src/utils/translation/poparser.cpp @@ -47,12 +47,12 @@ PoParser::PoParser() : void PoParser::openFile(const std::string &name) { int size; - char *buf = static_cast<char*>(VirtFs::loadFile(getFileName(name), size)); + char *buf = VirtFs::loadFile(getFileName(name), size); if (buf) { mFile.str(std::string(buf, size)); - free(buf); + delete [] buf; } else { diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index 7c64c1590..5f9b5d587 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -93,8 +93,7 @@ bool TranslationManager::translateFile(const std::string &fileName, return false; int contentsLength; - char *fileContents = static_cast<char*>( - VirtFs::loadFile(fileName, contentsLength)); + char *fileContents = VirtFs::loadFile(fileName, contentsLength); if (!fileContents) { @@ -127,6 +126,6 @@ bool TranslationManager::translateFile(const std::string &fileName, while (getline(iss, line)) lines.push_back(line); - free(fileContents); + delete [] fileContents; return true; } |