summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-29 18:31:00 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-29 18:31:00 +0300
commit7132f71cf010e4f13eb27c1a24d8878aa984b43f (patch)
tree330ad08a5ae15d0f4dc2d13461de1d5a47a69fe6 /src/utils
parentd9c0d1c3b2800b0c995393426b65a031203ca2f0 (diff)
downloadmv-7132f71cf010e4f13eb27c1a24d8878aa984b43f.tar.gz
mv-7132f71cf010e4f13eb27c1a24d8878aa984b43f.tar.bz2
mv-7132f71cf010e4f13eb27c1a24d8878aa984b43f.tar.xz
mv-7132f71cf010e4f13eb27c1a24d8878aa984b43f.zip
Remove extra memory copy in VirtFs::loadFile.
Also add const into VirtFs::loadFile.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/translation/poparser.cpp2
-rw-r--r--src/utils/translation/translationmanager.cpp3
-rw-r--r--src/utils/xml/libxml.cpp4
-rw-r--r--src/utils/xml/pugixml.cpp4
-rw-r--r--src/utils/xml/tinyxml2.cpp4
5 files changed, 9 insertions, 8 deletions
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp
index 6ac1221a9..af436b7de 100644
--- a/src/utils/translation/poparser.cpp
+++ b/src/utils/translation/poparser.cpp
@@ -46,7 +46,7 @@ PoParser::PoParser() :
void PoParser::openFile(const std::string &name)
{
int size;
- char *buf = VirtFs::loadFile(getFileName(name), size);
+ const char *buf = VirtFs::loadFile(getFileName(name), size);
if (buf)
{
diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp
index 12c5519c4..6acde15d6 100644
--- a/src/utils/translation/translationmanager.cpp
+++ b/src/utils/translation/translationmanager.cpp
@@ -93,7 +93,8 @@ bool TranslationManager::translateFile(const std::string &fileName,
return false;
int contentsLength;
- char *fileContents = VirtFs::loadFile(fileName, contentsLength);
+ const char *fileContents = VirtFs::loadFile(fileName,
+ contentsLength);
if (!fileContents)
{
diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp
index ccb3aca39..f7319f7ee 100644
--- a/src/utils/xml/libxml.cpp
+++ b/src/utils/xml/libxml.cpp
@@ -98,9 +98,9 @@ namespace XML
valid = true;
if (useResman == UseVirtFs_true)
{
- data = VirtFs::loadFile(
+ data = const_cast<char*>(VirtFs::loadFile(
filename.c_str(),
- size);
+ size));
}
else
{
diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp
index 1b5a3278e..7ad2779cd 100644
--- a/src/utils/xml/pugixml.cpp
+++ b/src/utils/xml/pugixml.cpp
@@ -76,9 +76,9 @@ namespace XML
valid = true;
if (useResman == UseVirtFs_true)
{
- data = VirtFs::loadFile(
+ data = const_cast<char*>(VirtFs::loadFile(
filename.c_str(),
- size);
+ size));
}
else
{
diff --git a/src/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp
index c88930828..214d08f42 100644
--- a/src/utils/xml/tinyxml2.cpp
+++ b/src/utils/xml/tinyxml2.cpp
@@ -68,9 +68,9 @@ namespace XML
valid = true;
if (useResman == UseVirtFs_true)
{
- data = VirtFs::loadFile(
+ data = const_cast<char*>(VirtFs::loadFile(
filename.c_str(),
- size);
+ size));
}
else
{