GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-29 16:25:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace some VFS exceptions with warnings

Browse Source 
These errors aren't necessarily fatal so tone them down.
This commit is contained in:
Billy Laws 2022-05-08 19:36:02 +01:00
parent e1c13bbc08
commit 018df355f0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/cpp/skyline/vfs/backing.h
View File

@ -56,7 +56,7 @@ namespace skyline::vfs {
*/ */
size_t ReadUnchecked(span <u8> output, size_t offset = 0) { size_t ReadUnchecked(span <u8> output, size_t offset = 0) {
if (!mode.read) if (!mode.read)
throw exception("Attempting to read a backing that is not readable"); Logger::Warn("Attempting to read a backing that is not readable");
return ReadImpl(output, offset); return ReadImpl(output, offset);
}; };
@ -75,7 +75,7 @@ namespace skyline::vfs {
throw exception("Trying to read past the end of a backing: 0x{:X}/0x{:X} (Offset: 0x{:X})", output.size(), size, offset); throw exception("Trying to read past the end of a backing: 0x{:X}/0x{:X} (Offset: 0x{:X})", output.size(), size, offset);
if (ReadUnchecked(output, offset) != output.size()) if (ReadUnchecked(output, offset) != output.size())
throw exception("Failed to read the requested size from backing"); Logger::Warn("Failed to read the requested size from backing");
return size; return size;
}; };
@ -108,13 +108,13 @@ namespace skyline::vfs {
*/ */
size_t Write(span <u8> input, size_t offset = 0) { size_t Write(span <u8> input, size_t offset = 0) {
if (!mode.write) if (!mode.write)
throw exception("Attempting to write to a backing that is not writable"); Logger::Warn("Attempting to write to a backing that is not writable");
if (input.size() > (static_cast<ssize_t>(size) - static_cast<ssize_t>(offset))) { if (input.size() > (static_cast<ssize_t>(size) - static_cast<ssize_t>(offset))) {
if (mode.append) if (mode.append)
Resize(offset + input.size()); Resize(offset + input.size());
else else
throw exception("Trying to write past the end of a non-appendable backing: 0x{:X}/0x{:X} (Offset: 0x{:X})", input.size(), size, offset); Logger::Warn("Trying to write past the end of a non-appendable backing: 0x{:X}/0x{:X} (Offset: 0x{:X})", input.size(), size, offset);
} }
return WriteImpl(input, offset); return WriteImpl(input, offset);
@ -129,7 +129,7 @@ namespace skyline::vfs {
void WriteObject(const T &object, size_t offset = 0) { void WriteObject(const T &object, size_t offset = 0) {
size_t lSize; size_t lSize;
if ((lSize = Write(span(reinterpret_cast<u8 *>(&object), sizeof(T)), offset)) != sizeof(T)) if ((lSize = Write(span(reinterpret_cast<u8 *>(&object), sizeof(T)), offset)) != sizeof(T))
throw exception("Object wasn't written fully into output backing: {}/{}", lSize, sizeof(T)); Logger::Warn("Object wasn't written fully into output backing: {}/{}", lSize, sizeof(T));
} }
/** /**