From 6ff6d6928328ff2110f028a374ade49415d5a0ba Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 28 Mar 2017 04:10:23 +0300
Subject: Remove physfs support.

---
 src/fs/virtfs/fileapi.h           | 2 --
 src/fs/virtfs/virtdirentry.cpp    | 2 --
 src/fs/virtfs/virtdirentry.h      | 2 --
 src/fs/virtfs/virtfileprivate.cpp | 2 --
 src/fs/virtfs/virtfileprivate.h   | 2 --
 src/fs/virtfs/virtfs.cpp          | 3 ---
 src/fs/virtfs/virtfs_unittest.cc  | 4 ----
 src/fs/virtfs/virtfsdir.cpp       | 3 ---
 src/fs/virtfs/virtfsdir.h         | 2 --
 src/fs/virtfs/virtfsentry.cpp     | 4 ----
 src/fs/virtfs/virtfsentry.h       | 2 --
 src/fs/virtfs/virtfszip.cpp       | 3 ---
 src/fs/virtfs/virtfszip.h         | 2 --
 src/fs/virtfs/virtzipentry.cpp    | 3 ---
 src/fs/virtfs/virtzipentry.h      | 2 --
 src/fs/virtfs/zip.cpp             | 3 ---
 src/fs/virtfs/zip.h               | 2 --
 src/fs/virtfs/zip_unittest.cc     | 3 ---
 src/fs/virtfs/ziplocalheader.cpp  | 3 ---
 src/fs/virtfs/ziplocalheader.h    | 2 --
 20 files changed, 51 deletions(-)

(limited to 'src/fs/virtfs')

diff --git a/src/fs/virtfs/fileapi.h b/src/fs/virtfs/fileapi.h
index 121506816..14e7b8204 100644
--- a/src/fs/virtfs/fileapi.h
+++ b/src/fs/virtfs/fileapi.h
@@ -20,7 +20,6 @@
 
 #ifndef UTILS_VIRTFS_FILEAPI_H
 #define UTILS_VIRTFS_FILEAPI_H
-#ifndef USE_PHYSFS
 
 #include "localconsts.h"
 
@@ -46,5 +45,4 @@
 #define FILEOPEN_FLAG_APPEND O_WRONLY | O_CREAT | O_APPEND
 #endif  // USE_FILE_FOPEN
 
-#endif  // USE_PHYSFS
 #endif  // UTILS_VIRTFS_FILEAPI_H
diff --git a/src/fs/virtfs/virtdirentry.cpp b/src/fs/virtfs/virtdirentry.cpp
index 3cf8dd600..a24fb12f5 100644
--- a/src/fs/virtfs/virtdirentry.cpp
+++ b/src/fs/virtfs/virtdirentry.cpp
@@ -18,7 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef USE_PHYSFS
 #include "fs/virtfs/virtdirentry.h"
 
 #include "debug.h"
@@ -35,4 +34,3 @@ VirtDirEntry::VirtDirEntry(const std::string &userDir0,
 VirtDirEntry::~VirtDirEntry()
 {
 }
-#endif  // USE_PHYSFS
diff --git a/src/fs/virtfs/virtdirentry.h b/src/fs/virtfs/virtdirentry.h
index a1cc4a24f..282eb21cd 100644
--- a/src/fs/virtfs/virtdirentry.h
+++ b/src/fs/virtfs/virtdirentry.h
@@ -20,7 +20,6 @@
 
 #ifndef UTILS_VIRTDIRENTRY_H
 #define UTILS_VIRTDIRENTRY_H
-#ifndef USE_PHYSFS
 
 #include "fs/virtfs/virtfsentry.h"
 
@@ -39,5 +38,4 @@ struct VirtDirEntry final : public VirtFsEntry
     std::string userDir;
 };
 
-#endif  // USE_PHYSFS
 #endif  // UTILS_VIRTDIRENTRY_H
diff --git a/src/fs/virtfs/virtfileprivate.cpp b/src/fs/virtfs/virtfileprivate.cpp
index eac55571e..57f06e986 100644
--- a/src/fs/virtfs/virtfileprivate.cpp
+++ b/src/fs/virtfs/virtfileprivate.cpp
@@ -18,7 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef USE_PHYSFS
 #include "fs/virtfs/virtfileprivate.h"
 
 #include "debug.h"
@@ -54,4 +53,3 @@ VirtFilePrivate::~VirtFilePrivate()
         FILECLOSE(mFd);
     delete [] mBuf;
 }
-#endif  // USE_PHYSFS
diff --git a/src/fs/virtfs/virtfileprivate.h b/src/fs/virtfs/virtfileprivate.h
index a9e1edf3e..d96cb5781 100644
--- a/src/fs/virtfs/virtfileprivate.h
+++ b/src/fs/virtfs/virtfileprivate.h
@@ -20,7 +20,6 @@
 
 #ifndef UTILS_VIRTFILEPRIVATE_H
 #define UTILS_VIRTFILEPRIVATE_H
-#ifndef USE_PHYSFS
 
 #include "localconsts.h"
 
@@ -50,5 +49,4 @@ struct VirtFilePrivate final
     FILEHTYPE mFd;
 };
 
-#endif  // USE_PHYSFS
 #endif  // UTILS_VIRTFILEPRIVATE_H
diff --git a/src/fs/virtfs/virtfs.cpp b/src/fs/virtfs/virtfs.cpp
index dd305303a..fbcb5b2ef 100644
--- a/src/fs/virtfs/virtfs.cpp
+++ b/src/fs/virtfs/virtfs.cpp
@@ -18,8 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef USE_PHYSFS
-
 #include "fs/virtfs.h"
 
 #include "fs/files.h"
@@ -570,4 +568,3 @@ namespace VirtFs
         return file->funcs->eof(file);
     }
 }  // namespace VirtFs
-#endif  // USE_PHYSFS
diff --git a/src/fs/virtfs/virtfs_unittest.cc b/src/fs/virtfs/virtfs_unittest.cc
index 126c3e1a7..1d5087e05 100644
--- a/src/fs/virtfs/virtfs_unittest.cc
+++ b/src/fs/virtfs/virtfs_unittest.cc
@@ -18,8 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef USE_PHYSFS
-
 #include "catch.hpp"
 
 #include "fs/files.h"
@@ -1422,5 +1420,3 @@ TEST_CASE("VirtFs1 read2")
     VirtFs::deinit();
     delete2(logger);
 }
-
-#endif  // USE_PHYSFS
diff --git a/src/fs/virtfs/virtfsdir.cpp b/src/fs/virtfs/virtfsdir.cpp
index 2092fcf31..357702de6 100644
--- a/src/fs/virtfs/virtfsdir.cpp
+++ b/src/fs/virtfs/virtfsdir.cpp
@@ -18,8 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef USE_PHYSFS
-
 #include "fs/virtfs/virtfsdir.h"
 
 #include "fs/files.h"
@@ -447,4 +445,3 @@ namespace VirtFsDir
         return pos < 0 || len < 0 || pos >= len;
     }
 }  // namespace VirtFs
-#endif  // USE_PHYSFS
diff --git a/src/fs/virtfs/virtfsdir.h b/src/fs/virtfs/virtfsdir.h
index b292bd71d..f85100e84 100644
--- a/src/fs/virtfs/virtfsdir.h
+++ b/src/fs/virtfs/virtfsdir.h
@@ -20,7 +20,6 @@
 
 #ifndef UTILS_VIRTFSDIR_H
 #define UTILS_VIRTFSDIR_H
-#ifndef USE_PHYSFS
 
 #include "fs/virtfs/fileapi.h"
 
@@ -85,5 +84,4 @@ namespace VirtFsDir
     int eof(VirtFile *restrict const file);
 }  // namespace VirtFsDir
 
-#endif  // USE_PHYSFS
 #endif  // UTILS_VIRTFSDIR_H
diff --git a/src/fs/virtfs/virtfsentry.cpp b/src/fs/virtfs/virtfsentry.cpp
index efffd0927..09f68148a 100644
--- a/src/fs/virtfs/virtfsentry.cpp
+++ b/src/fs/virtfs/virtfsentry.cpp
@@ -18,8 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef USE_PHYSFS
-
 #include "fs/virtfs/virtfsentry.h"
 
 #include "debug.h"
@@ -35,5 +33,3 @@ VirtFsEntry::VirtFsEntry(const FsEntryTypeT &type0,
 VirtFsEntry::~VirtFsEntry()
 {
 }
-
-#endif  // USE_PHYSFS
diff --git a/src/fs/virtfs/virtfsentry.h b/src/fs/virtfs/virtfsentry.h
index 56a1e71ee..467d374cb 100644
--- a/src/fs/virtfs/virtfsentry.h
+++ b/src/fs/virtfs/virtfsentry.h
@@ -20,7 +20,6 @@
 
 #ifndef UTILS_VIRTFSENTRY_H
 #define UTILS_VIRTFSENTRY_H
-#ifndef USE_PHYSFS
 
 #include "enums/fs/fsentrytype.h"
 
@@ -46,5 +45,4 @@ struct VirtFsEntry notfinal
     VirtFsFuncs *funcs;
 };
 
-#endif  // USE_PHYSFS
 #endif  // UTILS_VIRTFSENTRY_H
diff --git a/src/fs/virtfs/virtfszip.cpp b/src/fs/virtfs/virtfszip.cpp
index e085ac307..e9414136f 100644
--- a/src/fs/virtfs/virtfszip.cpp
+++ b/src/fs/virtfs/virtfszip.cpp
@@ -18,8 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef USE_PHYSFS
-
 #include "fs/virtfs/virtfszip.h"
 
 #include "fs/virtfsfuncs.h"
@@ -340,4 +338,3 @@ namespace VirtFsZip
         return file->mPrivate->mPos >= file->mPrivate->mSize;
     }
 }  // namespace VirtFsZip
-#endif  // USE_PHYSFS
diff --git a/src/fs/virtfs/virtfszip.h b/src/fs/virtfs/virtfszip.h
index f615e38fd..9094f9eba 100644
--- a/src/fs/virtfs/virtfszip.h
+++ b/src/fs/virtfs/virtfszip.h
@@ -20,7 +20,6 @@
 
 #ifndef UTILS_VIRTFSZIP_H
 #define UTILS_VIRTFSZIP_H
-#ifndef USE_PHYSFS
 
 #include "utils/stringvector.h"
 
@@ -74,5 +73,4 @@ namespace VirtFsZip
     int eof(VirtFile *restrict const file);
 }  // namespace VirtFsZip
 
-#endif  // USE_PHYSFS
 #endif  // UTILS_VIRTFSZIP_H
diff --git a/src/fs/virtfs/virtzipentry.cpp b/src/fs/virtfs/virtzipentry.cpp
index 216603bed..c832578bd 100644
--- a/src/fs/virtfs/virtzipentry.cpp
+++ b/src/fs/virtfs/virtzipentry.cpp
@@ -18,8 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef USE_PHYSFS
-
 #include "fs/virtfs/virtzipentry.h"
 
 #include "fs/virtfs/ziplocalheader.h"
@@ -41,4 +39,3 @@ VirtZipEntry::~VirtZipEntry()
 {
     delete_all(mHeaders);
 }
-#endif  // USE_PHYSFS
diff --git a/src/fs/virtfs/virtzipentry.h b/src/fs/virtfs/virtzipentry.h
index 6487deeb0..d3c69aa36 100644
--- a/src/fs/virtfs/virtzipentry.h
+++ b/src/fs/virtfs/virtzipentry.h
@@ -20,7 +20,6 @@
 
 #ifndef UTILS_VIRTZIPENTRY_H
 #define UTILS_VIRTZIPENTRY_H
-#ifndef USE_PHYSFS
 
 #include "fs/virtfs/virtfsentry.h"
 
@@ -43,5 +42,4 @@ struct VirtZipEntry final : public VirtFsEntry
     std::vector<std::string> mDirs;
 };
 
-#endif  // USE_PHYSFS
 #endif  // UTILS_VIRTZIPENTRY_H
diff --git a/src/fs/virtfs/zip.cpp b/src/fs/virtfs/zip.cpp
index c9276449b..330850aee 100644
--- a/src/fs/virtfs/zip.cpp
+++ b/src/fs/virtfs/zip.cpp
@@ -18,8 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef USE_PHYSFS
-
 #include "fs/virtfs/zip.h"
 
 #include "fs/paths.h"
@@ -321,4 +319,3 @@ namespace Zip
         return out;
     }
 }  // namespace Zip
-#endif  // USE_PHYSFS
diff --git a/src/fs/virtfs/zip.h b/src/fs/virtfs/zip.h
index 8efbd05e4..89e04408f 100644
--- a/src/fs/virtfs/zip.h
+++ b/src/fs/virtfs/zip.h
@@ -20,7 +20,6 @@
 
 #ifndef UTILS_ZIP_H
 #define UTILS_ZIP_H
-#ifndef USE_PHYSFS
 
 #include "localconsts.h"
 
@@ -39,5 +38,4 @@ namespace Zip
     uint8_t *readFile(const ZipLocalHeader *restrict const header);
 }  // namespace Zip
 
-#endif  // USE_PHYSFS
 #endif  // UTILS_ZIP_H
diff --git a/src/fs/virtfs/zip_unittest.cc b/src/fs/virtfs/zip_unittest.cc
index 27d4bc1f9..401768b7c 100644
--- a/src/fs/virtfs/zip_unittest.cc
+++ b/src/fs/virtfs/zip_unittest.cc
@@ -18,8 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef USE_PHYSFS
-
 #include "catch.hpp"
 
 #include "logger.h"
@@ -296,4 +294,3 @@ TEST_CASE("Zip readFile")
 
     delete2(logger);
 }
-#endif  // USE_PHYSFS
diff --git a/src/fs/virtfs/ziplocalheader.cpp b/src/fs/virtfs/ziplocalheader.cpp
index 40ddcaffd..47ed4d290 100644
--- a/src/fs/virtfs/ziplocalheader.cpp
+++ b/src/fs/virtfs/ziplocalheader.cpp
@@ -18,8 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef USE_PHYSFS
-
 #include "fs/virtfs/ziplocalheader.h"
 
 #include "localconsts.h"
@@ -35,4 +33,3 @@ ZipLocalHeader::ZipLocalHeader() :
     compressed(false)
 {
 }
-#endif  // USE_PHYSFS
diff --git a/src/fs/virtfs/ziplocalheader.h b/src/fs/virtfs/ziplocalheader.h
index 2ec781858..f3a1894ce 100644
--- a/src/fs/virtfs/ziplocalheader.h
+++ b/src/fs/virtfs/ziplocalheader.h
@@ -20,7 +20,6 @@
 
 #ifndef UTILS_ZIPLOCALHEADER_H
 #define UTILS_ZIPLOCALHEADER_H
-#ifndef USE_PHYSFS
 
 #include "localconsts.h"
 
@@ -42,5 +41,4 @@ struct ZipLocalHeader final
     bool compressed;
 };
 
-#endif  // USE_PHYSFS
 #endif  // UTILS_ZIPLOCALHEADER_H
-- 
cgit v1.2.3-70-g09d2