MadeOfJelly/MushMachine
MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2024-09-21 12:35:36 +02:00
Code Issues Projects Releases Wiki Activity

fix fs_const_archiver shadow warnings

Browse Source
This commit is contained in:
Green Sky 2021-04-24 02:07:11 +02:00
parent 337df23d12
commit 4776691b2b
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
framework/filesystem/src/mm/fs_const_archiver.cpp
View File

@ -127,34 +127,34 @@ PHYSFS_Io* FSConstArchiver::createIO(const char* filename, PHYSFS_uint64 pos) {
size_t data_size = 0; size_t data_size = 0;
}; };
auto io = new PHYSFS_Io; auto new_io = new PHYSFS_Io;
io->version = 0; new_io->version = 0;
io->write = nullptr; new_io->write = nullptr;
io->flush = nullptr; new_io->flush = nullptr;
io->opaque = new io_internal{ new_io->opaque = new io_internal{
filename, filename,
pos, pos,
_storage[filename].first, _storage[filename].first,
_storage[filename].second _storage[filename].second
}; };
io->destroy = [](PHYSFS_Io* io) { new_io->destroy = [](PHYSFS_Io* io) {
delete (io_internal*)io->opaque; delete (io_internal*)io->opaque;
delete io; delete io;
}; };
io->tell = [](PHYSFS_Io* io) -> PHYSFS_sint64 { return ((io_internal*)io->opaque)->pos; }; new_io->tell = [](PHYSFS_Io* io) -> PHYSFS_sint64 { return ((io_internal*)io->opaque)->pos; };
io->seek = [](PHYSFS_Io* io, PHYSFS_uint64 offset) -> int { new_io->seek = [](PHYSFS_Io* io, PHYSFS_uint64 offset) -> int {
auto* inter = (io_internal*)io->opaque; auto* inter = (io_internal*)io->opaque;
if (offset > inter->data_size) if (offset > inter->data_size)
return 0; // error, past end return 0; // error, past end
inter->pos = offset; inter->pos = offset;
return 1; return 1;
}; };
io->length = [](PHYSFS_Io* io) -> PHYSFS_sint64 { return ((io_internal*)io->opaque)->data_size; }; new_io->length = [](PHYSFS_Io* io) -> PHYSFS_sint64 { return ((io_internal*)io->opaque)->data_size; };
io->duplicate = [](PHYSFS_Io* io) -> PHYSFS_Io* { new_io->duplicate = [](PHYSFS_Io* io) -> PHYSFS_Io* {
if (!io) if (!io)
return nullptr; return nullptr;
@ -162,7 +162,7 @@ PHYSFS_Io* FSConstArchiver::createIO(const char* filename, PHYSFS_uint64 pos) {
auto* dup = createIO(inter->filename.c_str(), inter->pos); auto* dup = createIO(inter->filename.c_str(), inter->pos);
return dup; return dup;
}; };
io->read = [](PHYSFS_Io* io, void* buf, PHYSFS_uint64 len) -> PHYSFS_sint64 { new_io->read = [](PHYSFS_Io* io, void* buf, PHYSFS_uint64 len) -> PHYSFS_sint64 {
if (!io) if (!io)
return -1; return -1;
@ -182,7 +182,7 @@ PHYSFS_Io* FSConstArchiver::createIO(const char* filename, PHYSFS_uint64 pos) {
return bytes_to_read; return bytes_to_read;
}; };
return io; return new_io;
} }
bool FSConstArchiver::pathIsDir(const char* path) { bool FSConstArchiver::pathIsDir(const char* path) {