diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-29 17:16:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-29 17:16:27 +0300 |
| commit | d9c0d1c3b2800b0c995393426b65a031203ca2f0 (patch) | |
| tree | ae5a5bab4a7a2ef5fbb9229fa5ce153f0178d011 /src/fs/virtfs/virtfsdir.cpp | |
| parent | d1fb04c1d91596706ebf402acfdab24dabad19f4 (diff) | |
| download | manaplus-d9c0d1c3b2800b0c995393426b65a031203ca2f0.tar.gz manaplus-d9c0d1c3b2800b0c995393426b65a031203ca2f0.tar.bz2 manaplus-d9c0d1c3b2800b0c995393426b65a031203ca2f0.tar.xz manaplus-d9c0d1c3b2800b0c995393426b65a031203ca2f0.zip | |
Merge virtfileprivate with virtfile.
Because now physfs is gone and nothing to hide from other code.
Diffstat (limited to 'src/fs/virtfs/virtfsdir.cpp')
| -rw-r--r-- | src/fs/virtfs/virtfsdir.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/fs/virtfs/virtfsdir.cpp b/src/fs/virtfs/virtfsdir.cpp index 7521764fd..923d1409d 100644 --- a/src/fs/virtfs/virtfsdir.cpp +++ b/src/fs/virtfs/virtfsdir.cpp @@ -26,7 +26,6 @@ #include "fs/virtfs/virtdirentry.h" #include "fs/virtfs/virtfile.h" -#include "fs/virtfs/virtfileprivate.h" #include "fs/virtfs/virtfsfuncs.h" #include "fs/virtfs/virtlist.h" @@ -73,9 +72,7 @@ namespace VirtFsDir filename.c_str()); return nullptr; } - VirtFile *restrict const file = new VirtFile(&funcs); - file->mPrivate = new VirtFilePrivate(fd); - + VirtFile *restrict const file = new VirtFile(&funcs, fd); return file; } @@ -311,7 +308,7 @@ namespace VirtFsDir { if (file == nullptr) return 0; - FILEHTYPE fd = file->mPrivate->mFd; + FILEHTYPE fd = file->mFd; if (fd == FILEHDEFAULT) { reportAlways("VirtFsDir::read file not opened."); @@ -335,7 +332,7 @@ namespace VirtFsDir { if (file == nullptr) return 0; - FILEHTYPE fd = file->mPrivate->mFd; + FILEHTYPE fd = file->mFd; if (fd == FILEHDEFAULT) { reportAlways("VirtFsDir::write file not opened."); @@ -356,7 +353,7 @@ namespace VirtFsDir { if (file == nullptr) return -1; - FILEHTYPE fd = file->mPrivate->mFd; + FILEHTYPE fd = file->mFd; if (fd == FILEHDEFAULT) { reportAlways("VirtFsDir::fileLength file not opened."); @@ -384,7 +381,7 @@ namespace VirtFsDir if (file == nullptr) return -1; - FILEHTYPE fd = file->mPrivate->mFd; + FILEHTYPE fd = file->mFd; if (fd == FILEHDEFAULT) { reportAlways("VirtFsDir::tell file not opened."); @@ -404,7 +401,7 @@ namespace VirtFsDir if (file == nullptr) return 0; - FILEHTYPE fd = file->mPrivate->mFd; + FILEHTYPE fd = file->mFd; if (fd == FILEHDEFAULT) { reportAlways("VirtFsDir::seek file not opened."); @@ -421,7 +418,7 @@ namespace VirtFsDir if (file == nullptr) return -1; - FILEHTYPE fd = file->mPrivate->mFd; + FILEHTYPE fd = file->mFd; if (fd == FILEHDEFAULT) { reportAlways("VirtFsDir::eof file not opened."); |