summaryrefslogtreecommitdiff
path: root/src/fs/virtfs
diff options
context:
space:
mode:
Diffstat (limited to 'src/fs/virtfs')
-rw-r--r--src/fs/virtfs/direntry.cpp2
-rw-r--r--src/fs/virtfs/direntry.h2
-rw-r--r--src/fs/virtfs/file.cpp4
-rw-r--r--src/fs/virtfs/file.h8
-rw-r--r--src/fs/virtfs/fsentry.cpp2
-rw-r--r--src/fs/virtfs/fsentry.h6
-rw-r--r--src/fs/virtfs/fsfuncs.h (renamed from src/fs/virtfs/virtfsfuncs.h)6
-rw-r--r--src/fs/virtfs/virtfs.cpp2
-rw-r--r--src/fs/virtfs/virtfsdir.cpp8
-rw-r--r--src/fs/virtfs/virtfsdir.h6
-rw-r--r--src/fs/virtfs/virtfsrwops.cpp2
-rw-r--r--src/fs/virtfs/virtfszip.cpp8
-rw-r--r--src/fs/virtfs/virtfszip.h6
-rw-r--r--src/fs/virtfs/virtzipentry.cpp2
-rw-r--r--src/fs/virtfs/virtzipentry.h2
15 files changed, 33 insertions, 33 deletions
diff --git a/src/fs/virtfs/direntry.cpp b/src/fs/virtfs/direntry.cpp
index 618d3675d..2e82182ce 100644
--- a/src/fs/virtfs/direntry.cpp
+++ b/src/fs/virtfs/direntry.cpp
@@ -27,7 +27,7 @@ namespace VirtFs
DirEntry::DirEntry(const std::string &userDir0,
const std::string &rootDir,
- VirtFsFuncs *restrict const funcs0) :
+ FsFuncs *restrict const funcs0) :
FsEntry(FsEntryType::Dir, funcs0),
userDir(userDir0)
{
diff --git a/src/fs/virtfs/direntry.h b/src/fs/virtfs/direntry.h
index c803093c1..7eac95a0a 100644
--- a/src/fs/virtfs/direntry.h
+++ b/src/fs/virtfs/direntry.h
@@ -32,7 +32,7 @@ struct DirEntry final : public FsEntry
{
DirEntry(const std::string &userDir,
const std::string &rootDir,
- VirtFsFuncs *restrict const funcs);
+ FsFuncs *restrict const funcs);
A_DELETE_COPY(DirEntry)
diff --git a/src/fs/virtfs/file.cpp b/src/fs/virtfs/file.cpp
index f7b3c7796..fb7fcee11 100644
--- a/src/fs/virtfs/file.cpp
+++ b/src/fs/virtfs/file.cpp
@@ -25,7 +25,7 @@
namespace VirtFs
{
-File::File(const VirtFsFuncs *restrict const funcs0,
+File::File(const FsFuncs *restrict const funcs0,
const uint8_t *restrict const buf,
const size_t sz) :
funcs(funcs0),
@@ -36,7 +36,7 @@ File::File(const VirtFsFuncs *restrict const funcs0,
{
}
-File::File(const VirtFsFuncs *restrict const funcs0,
+File::File(const FsFuncs *restrict const funcs0,
FILEHTYPE fd) :
funcs(funcs0),
mBuf(nullptr),
diff --git a/src/fs/virtfs/file.h b/src/fs/virtfs/file.h
index 33ce959df..c564bade4 100644
--- a/src/fs/virtfs/file.h
+++ b/src/fs/virtfs/file.h
@@ -28,22 +28,22 @@
namespace VirtFs
{
-struct VirtFsFuncs;
+struct FsFuncs;
struct File final
{
- File(const VirtFsFuncs *restrict const funcs0,
+ File(const FsFuncs *restrict const funcs0,
const uint8_t *restrict const buf,
const size_t sz);
- File(const VirtFsFuncs *restrict const funcs0,
+ File(const FsFuncs *restrict const funcs0,
FILEHTYPE fd);
A_DELETE_COPY(File)
~File();
- const VirtFsFuncs *funcs;
+ const FsFuncs *funcs;
// zipfs fields
const uint8_t *mBuf;
diff --git a/src/fs/virtfs/fsentry.cpp b/src/fs/virtfs/fsentry.cpp
index 10d84415b..b1e9ebdc3 100644
--- a/src/fs/virtfs/fsentry.cpp
+++ b/src/fs/virtfs/fsentry.cpp
@@ -26,7 +26,7 @@ namespace VirtFs
{
FsEntry::FsEntry(const FsEntryTypeT &type0,
- VirtFsFuncs *restrict const funcs0) :
+ FsFuncs *restrict const funcs0) :
root(),
type(type0),
funcs(funcs0)
diff --git a/src/fs/virtfs/fsentry.h b/src/fs/virtfs/fsentry.h
index 4cadd92e5..9f6baa239 100644
--- a/src/fs/virtfs/fsentry.h
+++ b/src/fs/virtfs/fsentry.h
@@ -30,12 +30,12 @@
namespace VirtFs
{
-struct VirtFsFuncs;
+struct FsFuncs;
struct FsEntry notfinal
{
FsEntry(const FsEntryTypeT &type0,
- VirtFsFuncs *restrict const funcs);
+ FsFuncs *restrict const funcs);
A_DELETE_COPY(FsEntry)
@@ -45,7 +45,7 @@ struct FsEntry notfinal
FsEntryTypeT type;
- VirtFsFuncs *funcs;
+ FsFuncs *funcs;
};
} // namespace VirtFs
diff --git a/src/fs/virtfs/virtfsfuncs.h b/src/fs/virtfs/fsfuncs.h
index 70f9882ab..e9a79562c 100644
--- a/src/fs/virtfs/virtfsfuncs.h
+++ b/src/fs/virtfs/fsfuncs.h
@@ -35,9 +35,9 @@ namespace VirtFs
struct File;
struct FsEntry;
-struct VirtFsFuncs final
+struct FsFuncs final
{
- VirtFsFuncs() :
+ FsFuncs() :
close(nullptr),
read(nullptr),
write(nullptr),
@@ -66,7 +66,7 @@ struct VirtFsFuncs final
{
}
- A_DELETE_COPY(VirtFsFuncs)
+ A_DELETE_COPY(FsFuncs)
int (*close) (File *restrict const file);
int64_t (*read) (File *restrict const file,
diff --git a/src/fs/virtfs/virtfs.cpp b/src/fs/virtfs/virtfs.cpp
index fae3bc908..67b01ff3a 100644
--- a/src/fs/virtfs/virtfs.cpp
+++ b/src/fs/virtfs/virtfs.cpp
@@ -26,7 +26,7 @@
#include "fs/virtfs/direntry.h"
#include "fs/virtfs/file.h"
#include "fs/virtfs/virtfsdir.h"
-#include "fs/virtfs/virtfsfuncs.h"
+#include "fs/virtfs/fsfuncs.h"
#include "fs/virtfs/virtfszip.h"
#include "fs/virtfs/virtlist.h"
#include "fs/virtfs/virtzipentry.h"
diff --git a/src/fs/virtfs/virtfsdir.cpp b/src/fs/virtfs/virtfsdir.cpp
index 0f94e3fa0..f3ef04b9c 100644
--- a/src/fs/virtfs/virtfsdir.cpp
+++ b/src/fs/virtfs/virtfsdir.cpp
@@ -27,7 +27,7 @@
#include "fs/virtfs/direntry.h"
#include "fs/virtfs/file.h"
#include "fs/virtfs/virtfsdirrwops.h"
-#include "fs/virtfs/virtfsfuncs.h"
+#include "fs/virtfs/fsfuncs.h"
#include "fs/virtfs/virtlist.h"
#include "utils/checkutils.h"
@@ -56,7 +56,7 @@ namespace
std::string mBaseDir;
std::string mUserDir;
bool mPermitLinks = false;
- VirtFsFuncs funcs;
+ FsFuncs funcs;
} // namespace
namespace VirtFsDir
@@ -123,7 +123,7 @@ namespace VirtFsDir
initFuncs(&funcs);
}
- void initFuncs(VirtFsFuncs *restrict const ptr)
+ void initFuncs(FsFuncs *restrict const ptr)
{
ptr->close = &VirtFsDir::close;
ptr->read = &VirtFsDir::read;
@@ -152,7 +152,7 @@ namespace VirtFsDir
#endif // USE_SDL2
}
- VirtFsFuncs *getFuncs()
+ FsFuncs *getFuncs()
{
return &funcs;
}
diff --git a/src/fs/virtfs/virtfsdir.h b/src/fs/virtfs/virtfsdir.h
index e0379e06d..509b843d4 100644
--- a/src/fs/virtfs/virtfsdir.h
+++ b/src/fs/virtfs/virtfsdir.h
@@ -32,7 +32,7 @@ namespace VirtFs
struct File;
struct FsEntry;
-struct VirtFsFuncs;
+struct FsFuncs;
struct VirtList;
namespace VirtFsDir
@@ -48,9 +48,9 @@ namespace VirtFsDir
const std::string &filename);
const char *getBaseDir();
const char *getUserDir();
- VirtFsFuncs *getFuncs();
+ FsFuncs *getFuncs();
void init(const std::string &restrict name);
- void initFuncs(VirtFsFuncs *restrict const ptr);
+ void initFuncs(FsFuncs *restrict const ptr);
void deinit();
bool exists(FsEntry *restrict const entry,
const std::string &fileName,
diff --git a/src/fs/virtfs/virtfsrwops.cpp b/src/fs/virtfs/virtfsrwops.cpp
index dfa6699bd..48a446928 100644
--- a/src/fs/virtfs/virtfsrwops.cpp
+++ b/src/fs/virtfs/virtfsrwops.cpp
@@ -48,7 +48,7 @@
#include "fs/virtfs/file.h"
#include "fs/virtfs/virtfs.h"
-#include "fs/virtfs/virtfsfuncs.h"
+#include "fs/virtfs/fsfuncs.h"
#include "utils/fuzzer.h"
diff --git a/src/fs/virtfs/virtfszip.cpp b/src/fs/virtfs/virtfszip.cpp
index fc7cbbd6b..5b3d60185 100644
--- a/src/fs/virtfs/virtfszip.cpp
+++ b/src/fs/virtfs/virtfszip.cpp
@@ -21,7 +21,7 @@
#include "fs/virtfs/virtfszip.h"
#include "fs/virtfs/file.h"
-#include "fs/virtfs/virtfsfuncs.h"
+#include "fs/virtfs/fsfuncs.h"
#include "fs/virtfs/virtfsziprwops.h"
#include "fs/virtfs/virtlist.h"
#include "fs/virtfs/virtzipentry.h"
@@ -37,7 +37,7 @@ extern const char *dirSeparator;
namespace
{
- VirtFs::VirtFsFuncs funcs;
+ VirtFs::FsFuncs funcs;
} // namespace
namespace VirtFs
@@ -45,7 +45,7 @@ namespace VirtFs
namespace VirtFsZip
{
- VirtFsFuncs *getFuncs()
+ FsFuncs *getFuncs()
{
return &funcs;
}
@@ -59,7 +59,7 @@ namespace VirtFsZip
initFuncs(&funcs);
}
- void initFuncs(VirtFsFuncs *restrict const ptr)
+ void initFuncs(FsFuncs *restrict const ptr)
{
ptr->close = &VirtFsZip::close;
ptr->read = &VirtFsZip::read;
diff --git a/src/fs/virtfs/virtfszip.h b/src/fs/virtfs/virtfszip.h
index bcf7a3697..60ecb3a8f 100644
--- a/src/fs/virtfs/virtfszip.h
+++ b/src/fs/virtfs/virtfszip.h
@@ -30,14 +30,14 @@ namespace VirtFs
struct File;
struct VirtList;
-struct VirtFsFuncs;
+struct FsFuncs;
struct FsEntry;
namespace VirtFsZip
{
- VirtFsFuncs *getFuncs();
+ FsFuncs *getFuncs();
void init();
- void initFuncs(VirtFsFuncs *restrict const ptr);
+ void initFuncs(FsFuncs *restrict const ptr);
void deinit();
bool exists(FsEntry *restrict const entry,
const std::string &filename,
diff --git a/src/fs/virtfs/virtzipentry.cpp b/src/fs/virtfs/virtzipentry.cpp
index f84b3083e..938059c5d 100644
--- a/src/fs/virtfs/virtzipentry.cpp
+++ b/src/fs/virtfs/virtzipentry.cpp
@@ -30,7 +30,7 @@ namespace VirtFs
{
VirtZipEntry::VirtZipEntry(const std::string &restrict archiveName,
- VirtFsFuncs *restrict const funcs0) :
+ FsFuncs *restrict const funcs0) :
FsEntry(FsEntryType::Zip, funcs0),
mHeaders(),
mDirs()
diff --git a/src/fs/virtfs/virtzipentry.h b/src/fs/virtfs/virtzipentry.h
index 841fd7775..792434b45 100644
--- a/src/fs/virtfs/virtzipentry.h
+++ b/src/fs/virtfs/virtzipentry.h
@@ -35,7 +35,7 @@ struct ZipLocalHeader;
struct VirtZipEntry final : public FsEntry
{
VirtZipEntry(const std::string &restrict archiveName,
- VirtFsFuncs *restrict const funcs);
+ FsFuncs *restrict const funcs);
A_DELETE_COPY(VirtZipEntry)
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 01:00:34 +0000