diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-04-01 00:30:58 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-04-01 00:30:58 +0300 |
| commit | 55e0c28be50b70d2b69dd805f249074b6c191ad2 (patch) | |
| tree | 16c624c3fbc1fb42d2b526d8edce487a0e3f5651 /src/fs/virtfs | |
| parent | ef151a7e96c9339660590bf908825c5f42d7d2f3 (diff) | |
| download | ManaVerse-55e0c28be50b70d2b69dd805f249074b6c191ad2.tar.gz ManaVerse-55e0c28be50b70d2b69dd805f249074b6c191ad2.tar.bz2 ManaVerse-55e0c28be50b70d2b69dd805f249074b6c191ad2.tar.xz ManaVerse-55e0c28be50b70d2b69dd805f249074b6c191ad2.zip | |
Fix compilation for android and fix code style.
Diffstat (limited to 'src/fs/virtfs')
| -rw-r--r-- | src/fs/virtfs/virtfsdir.cpp | 6 | ||||
| -rw-r--r-- | src/fs/virtfs/virtfsziprwops.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/fs/virtfs/virtfsdir.cpp b/src/fs/virtfs/virtfsdir.cpp index c3c2cad73..7f693b8ae 100644 --- a/src/fs/virtfs/virtfsdir.cpp +++ b/src/fs/virtfs/virtfsdir.cpp @@ -455,7 +455,7 @@ namespace VirtFsDir const std::string &restrict filename, int &restrict fileSize) { - VirtDirEntry *const dirEntry = static_cast<VirtDirEntry*>(entry); + const VirtDirEntry *const dirEntry = static_cast<VirtDirEntry*>(entry); const std::string path = entry->root + filename; if (Files::existsLocal(path) == false) return nullptr; @@ -493,9 +493,9 @@ namespace VirtFsDir buffer[fileSize - 1] = 0; #ifdef USE_FILE_FOPEN - int cnt = fread(buffer, 1, fileSize, fd); + const int cnt = fread(buffer, 1, fileSize, fd); #else // USE_FILE_FOPEN - int cnt = ::read(fd, buffer, fileSize); + const int cnt = ::read(fd, buffer, fileSize); #endif // USE_FILE_FOPEN if (cnt <= 0) diff --git a/src/fs/virtfs/virtfsziprwops.cpp b/src/fs/virtfs/virtfsziprwops.cpp index 24162e129..098b409e3 100644 --- a/src/fs/virtfs/virtfsziprwops.cpp +++ b/src/fs/virtfs/virtfsziprwops.cpp @@ -137,10 +137,10 @@ namespace VirtFsZip #ifdef USE_SDL2 RWOPSINT rwops_size(SDL_RWops *const rw) { - VirtFile *const handle = static_cast<VirtFile *const>( - rw->hidden.unknown.data1); if (!rw) return 0; + VirtFile *const handle = static_cast<VirtFile *const>( + rw->hidden.unknown.data1); return handle->mSize; } #endif // USE_SDL2 |