Split virtfs.cpp into virtfs.cpp and virtfstools.cpp

15 files changed, 166 insertions, 85 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8aa75a4d8..e2c2103f3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -889,6 +889,8 @@ SET(SRCS
     utils/debugmemoryobject.h
     utils/virtfsrwops.cpp
     utils/virtfsrwops.h
+    utils/virtfstools.cpp
+    utils/virtfstools.h
     utils/virtfs.cpp
     utils/virtfs.h
     utils/process.cpp
@@ -1771,6 +1773,8 @@ SET(DYE_CMD_SRCS
     utils/perfomance.h
     utils/virtfsrwops.cpp
     utils/virtfsrwops.h
+    utils/virtfstools.cpp
+    utils/virtfstools.h
     utils/virtfs.cpp
     utils/virtfs.h
     utils/sdl2helper.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index a9722e9b4..a3b6147b3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -549,6 +549,8 @@ BASE_SRC += events/actionevent.h \
 	      utils/debugmemoryobject.h \
 	      utils/virtfsrwops.cpp \
 	      utils/virtfsrwops.h \
+	      utils/virtfstools.cpp \
+	      utils/virtfstools.h \
 	      utils/virtfs.cpp \
 	      utils/virtfs.h \
 	      utils/process.cpp \
diff --git a/src/client.cpp b/src/client.cpp
index 79d4ce339..ae5daa3cb 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -144,6 +144,7 @@
 #include "utils/paths.h"
 #endif  // ANDROID
 #include "utils/virtfs.h"
+#include "utils/virtfstools.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/timer.h"
 
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index c601881f7..3fdae7e14 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -64,6 +64,7 @@
 #endif  // ANDROID
 
 #include "utils/virtfs.h"
+#include "utils/virtfstools.h"
 #include "utils/sdlcheckutils.h"
 #include "utils/timer.h"
 
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 07ca2c6d3..ddb265bc7 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -46,6 +46,7 @@
 #include "utils/delete2.h"
 #include "utils/files.h"
 #include "utils/virtfs.h"
+#include "utils/virtfstools.h"
 #include "utils/gettext.h"
 #include "utils/mkdir.h"
 #include "utils/paths.h"
diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc
index fe6ccc6f4..65c4b5fb9 100644
--- a/src/integrity_unittest.cc
+++ b/src/integrity_unittest.cc
@@ -41,6 +41,7 @@
 #include "utils/env.h"
 #include "utils/virtfs.h"
 #include "utils/virtfsrwops.h"
+#include "utils/virtfstools.h"
 
 #include <physfs.h>
 #include <SDL_image.h>
diff --git a/src/utils/files.cpp b/src/utils/files.cpp
index 5f1258dda..e1685effb 100644
--- a/src/utils/files.cpp
+++ b/src/utils/files.cpp
@@ -29,6 +29,7 @@
 #include "utils/mkdir.h"
 #include "utils/paths.h"
 #include "utils/virtfs.h"
+#include "utils/virtfstools.h"
 #include "utils/stringutils.h"
 
 #include <algorithm>
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp
index 2f591f2e4..7aaca2349 100644
--- a/src/utils/translation/poparser.cpp
+++ b/src/utils/translation/poparser.cpp
@@ -21,6 +21,7 @@
 #include "utils/translation/poparser.h"
 
 #include "utils/virtfs.h"
+#include "utils/virtfstools.h"
 #include "utils/stringutils.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp
index 24342e8a1..199acc844 100644
--- a/src/utils/translation/translationmanager.cpp
+++ b/src/utils/translation/translationmanager.cpp
@@ -21,7 +21,7 @@
 #include "utils/translation/translationmanager.h"
 
 #include "utils/delete2.h"
-#include "utils/virtfs.h"
+#include "utils/virtfstools.h"
 #include "utils/stringutils.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/utils/virtfs.cpp b/src/utils/virtfs.cpp
index e5b407f35..2a11d6ba8 100644
--- a/src/utils/virtfs.cpp
+++ b/src/utils/virtfs.cpp
@@ -193,32 +193,6 @@ namespace VirtFs
         return PHYSFS_mkdir(dirname);
     }
 
-    void *loadFile(const std::string &fileName, int &fileSize)
-    {
-        // Attempt to open the specified file using PhysicsFS
-        VirtFile *const file = VirtFs::openRead(fileName.c_str());
-
-        if (!file)
-        {
-            logger->log("Warning: Failed to load %s: %s",
-                fileName.c_str(),
-                VirtFs::getLastError());
-            return nullptr;
-        }
-
-        logger->log("Loaded %s/%s",
-            VirtFs::getRealDir(fileName.c_str()),
-            fileName.c_str());
-
-        fileSize = CAST_S32(VirtFs::fileLength(file));
-        // Allocate memory and load the file
-        void *const buffer = calloc(fileSize, 1);
-        VirtFs::read(file, buffer, 1, fileSize);
-        VirtFs::close(file);
-
-        return buffer;
-    }
-
     bool deinit()
     {
         if (PHYSFS_deinit() != 0)
@@ -299,50 +273,4 @@ namespace VirtFs
     {
         return PHYSFS_eof(file->mPrivate->mFile);
     }
-
-    void searchAndAddArchives(const std::string &restrict path,
-                              const std::string &restrict ext,
-                              const Append append)
-    {
-        char **list = VirtFs::enumerateFiles(path.c_str());
-
-        for (char **i = list; *i; i++)
-        {
-            const size_t len = strlen(*i);
-
-            if (len > ext.length() &&
-                !ext.compare((*i) + (len - ext.length())))
-            {
-                const std::string file = path + (*i);
-                const std::string realPath = std::string(
-                    VirtFs::getRealDir(file.c_str()));
-                VirtFs::addZipToSearchPath(std::string(realPath).append(
-                    dirSeparator).append(file), append);
-            }
-        }
-        VirtFs::freeList(list);
-    }
-
-    void searchAndRemoveArchives(const std::string &restrict path,
-                                 const std::string &restrict ext)
-    {
-        char **list = VirtFs::enumerateFiles(path.c_str());
-
-        for (char **i = list; *i; i++)
-        {
-            const size_t len = strlen(*i);
-            if (len > ext.length() &&
-                !ext.compare((*i) + (len - ext.length())))
-            {
-                const std::string file = path + (*i);
-                const std::string realPath = std::string(
-                    VirtFs::getRealDir(file.c_str()));
-                VirtFs::removeZipFromSearchPath(std::string(
-                    realPath).append(
-                    dirSeparator).append(
-                    file));
-            }
-        }
-        VirtFs::freeList(list);
-    }
-}  // namespace PhysFs
+}  // namespace VirtFs
diff --git a/src/utils/virtfs.h b/src/utils/virtfs.h
index 05243817f..60804d64f 100644
--- a/src/utils/virtfs.h
+++ b/src/utils/virtfs.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UTILS_PHYSFSTOOLS_H
-#define UTILS_PHYSFSTOOLS_H
+#ifndef UTILS_VIRTFS_H
+#define UTILS_VIRTFS_H
 
 #include "enums/simpletypes/append.h"
 
@@ -52,7 +52,6 @@ namespace VirtFs
     bool removeZipFromSearchPath(const std::string &oldDir);
     const char *getRealDir(const char *const filename);
     bool mkdir(const char *const dirName);
-    void *loadFile(const std::string &fileName, int &fileSize);
     bool deinit();
     void permitLinks(const bool val);
     const char *getLastError();
@@ -70,13 +69,8 @@ namespace VirtFs
     int seek(VirtFile *const file,
              const uint64_t pos);
     int eof(VirtFile *const file);
-    void searchAndAddArchives(const std::string &restrict path,
-                              const std::string &restrict ext,
-                              const Append append);
-    void searchAndRemoveArchives(const std::string &restrict path,
-                                 const std::string &restrict ext);
 }  // namespace VirtFs
 
 extern const char *dirSeparator;
 
-#endif  // UTILS_PHYSFSTOOLS_H
+#endif  // UTILS_VIRTFS_H
diff --git a/src/utils/virtfstools.cpp b/src/utils/virtfstools.cpp
new file mode 100644
index 000000000..528a9533e
--- /dev/null
+++ b/src/utils/virtfstools.cpp
@@ -0,0 +1,105 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2013-2017  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "utils/virtfstools.h"
+
+#include "logger.h"
+
+#include "utils/virtfile.h"
+#include "utils/virtfs.h"
+
+#include <unistd.h>
+
+#include "debug.h"
+
+namespace VirtFs
+{
+    void *loadFile(const std::string &fileName, int &fileSize)
+    {
+        // Attempt to open the specified file using PhysicsFS
+        VirtFile *const file = VirtFs::openRead(fileName.c_str());
+
+        if (!file)
+        {
+            logger->log("Warning: Failed to load %s: %s",
+                fileName.c_str(),
+                VirtFs::getLastError());
+            return nullptr;
+        }
+
+        logger->log("Loaded %s/%s",
+            VirtFs::getRealDir(fileName.c_str()),
+            fileName.c_str());
+
+        fileSize = CAST_S32(VirtFs::fileLength(file));
+        // Allocate memory and load the file
+        void *const buffer = calloc(fileSize, 1);
+        VirtFs::read(file, buffer, 1, fileSize);
+        VirtFs::close(file);
+
+        return buffer;
+    }
+
+    void searchAndAddArchives(const std::string &restrict path,
+                              const std::string &restrict ext,
+                              const Append append)
+    {
+        char **list = VirtFs::enumerateFiles(path.c_str());
+
+        for (char **i = list; *i; i++)
+        {
+            const size_t len = strlen(*i);
+
+            if (len > ext.length() &&
+                !ext.compare((*i) + (len - ext.length())))
+            {
+                const std::string file = path + (*i);
+                const std::string realPath = std::string(
+                    VirtFs::getRealDir(file.c_str()));
+                VirtFs::addZipToSearchPath(std::string(realPath).append(
+                    dirSeparator).append(file), append);
+            }
+        }
+        VirtFs::freeList(list);
+    }
+
+    void searchAndRemoveArchives(const std::string &restrict path,
+                                 const std::string &restrict ext)
+    {
+        char **list = VirtFs::enumerateFiles(path.c_str());
+
+        for (char **i = list; *i; i++)
+        {
+            const size_t len = strlen(*i);
+            if (len > ext.length() &&
+                !ext.compare((*i) + (len - ext.length())))
+            {
+                const std::string file = path + (*i);
+                const std::string realPath = std::string(
+                    VirtFs::getRealDir(file.c_str()));
+                VirtFs::removeZipFromSearchPath(std::string(
+                    realPath).append(
+                    dirSeparator).append(
+                    file));
+            }
+        }
+        VirtFs::freeList(list);
+    }
+}  // namespace VirtFs
diff --git a/src/utils/virtfstools.h b/src/utils/virtfstools.h
new file mode 100644
index 000000000..be16dddea
--- /dev/null
+++ b/src/utils/virtfstools.h
@@ -0,0 +1,42 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2013-2017  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef UTILS_VIRTFSTOOLS_H
+#define UTILS_VIRTFSTOOLS_H
+
+#include "enums/simpletypes/append.h"
+
+#include "localconsts.h"
+
+#include <string>
+
+struct VirtFile;
+
+namespace VirtFs
+{
+    void *loadFile(const std::string &fileName, int &fileSize);
+    void searchAndAddArchives(const std::string &restrict path,
+                              const std::string &restrict ext,
+                              const Append append);
+    void searchAndRemoveArchives(const std::string &restrict path,
+                                 const std::string &restrict ext);
+}  // namespace VirtFs
+
+#endif  // UTILS_VIRTFSTOOLS_H
diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp
index dc0e6385a..c19255b24 100644
--- a/src/utils/xml/libxml.cpp
+++ b/src/utils/xml/libxml.cpp
@@ -26,7 +26,7 @@
 
 #include "utils/checkutils.h"
 #include "utils/fuzzer.h"
-#include "utils/virtfs.h"
+#include "utils/virtfstools.h"
 #include "utils/stringutils.h"
 
 #include "utils/translation/podict.h"
diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp
index 55ca0f60f..955b170f6 100644
--- a/src/utils/xml/pugixml.cpp
+++ b/src/utils/xml/pugixml.cpp
@@ -27,7 +27,7 @@
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
 #include "utils/fuzzer.h"
-#include "utils/virtfs.h"
+#include "utils/virtfstools.h"
 #include "utils/stringutils.h"
 
 #include "utils/translation/podict.h"