From 266773f838c6c0c6f857a7a7fbcbbe8d6333f03b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 18 Jan 2017 21:51:16 +0300
Subject: Replace left direct physfs functions calls into physfs namespace
 functions.

---
 src/gui/theme.cpp                                 |  4 ++--
 src/resources/resourcemanager/resourcemanager.cpp |  4 ++--
 src/utils/physfstools.cpp                         | 10 ++++++++++
 src/utils/physfstools.h                           |  2 ++
 4 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index a22f682e6..76a5d0a94 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -570,9 +570,9 @@ void Theme::fillSkinsList(StringVect &list)
 
 void Theme::fillFontsList(StringVect &list)
 {
-    PHYSFS_permitSymbolicLinks(1);
+    PhysFs::permitLinks(true);
     Files::getFiles(branding.getStringValue("fontsPath"), list);
-    PHYSFS_permitSymbolicLinks(0);
+    PhysFs::permitLinks(false);
 }
 
 void Theme::fillSoundsList(StringVect &list)
diff --git a/src/resources/resourcemanager/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp
index 04811510e..0612fdbb4 100644
--- a/src/resources/resourcemanager/resourcemanager.cpp
+++ b/src/resources/resourcemanager/resourcemanager.cpp
@@ -349,7 +349,7 @@ bool ResourceManager::addToSearchPath(const std::string &path,
     {
         logger->log("Error: %s: addToSearchPath failed: %s",
             path.c_str(),
-            PHYSFS_getLastError());
+            PhysFs::getLastError());
         return false;
     }
     return true;
@@ -362,7 +362,7 @@ bool ResourceManager::removeFromSearchPath(const std::string &path) const
     {
         logger->log("Error: %s: removeFromSearchPath failed: %s",
             path.c_str(),
-            PHYSFS_getLastError());
+            PhysFs::getLastError());
         return false;
     }
     return true;
diff --git a/src/utils/physfstools.cpp b/src/utils/physfstools.cpp
index 1424bb2a2..cc17c09b3 100644
--- a/src/utils/physfstools.cpp
+++ b/src/utils/physfstools.cpp
@@ -171,4 +171,14 @@ namespace PhysFs
         }
         return true;
     }
+
+    void permitLinks(const bool val)
+    {
+        PHYSFS_permitSymbolicLinks(val ? 1 : 0);
+    }
+
+    const char *getLastError()
+    {
+        return PHYSFS_getLastError();
+    }
 }  // namespace PhysFs
diff --git a/src/utils/physfstools.h b/src/utils/physfstools.h
index e524dad64..dd91f18b1 100644
--- a/src/utils/physfstools.h
+++ b/src/utils/physfstools.h
@@ -45,6 +45,8 @@ namespace PhysFs
     bool mkdir(const char *const dirName);
     void *loadFile(const std::string &fileName, int &fileSize);
     bool deinit();
+    void permitLinks(const bool val);
+    const char *getLastError();
 }  // namespace PhysFs
 
 extern const char *dirSeparator;
-- 
cgit v1.2.3-60-g2f50