The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 07:21:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

DiscExtractor: Improve error handling

Browse Source
This commit is contained in:
JosJuice 2017-06-17 13:28:14 +02:00
parent a17272c146
commit 1f31390b54
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/DiscIO/DiscExtractor.cpp
View File

@ -28,7 +28,8 @@ u64 ReadFile(const Volume& volume, const Partition& partition, const FileInfo* f
read_length, offset_in_file, file_info->GetPath().c_str(), file_info->GetOffset(), read_length, offset_in_file, file_info->GetPath().c_str(), file_info->GetOffset(),
file_info->GetSize()); file_info->GetSize());
volume.Read(file_info->GetOffset() + offset_in_file, read_length, buffer, partition); if (!volume.Read(file_info->GetOffset() + offset_in_file, read_length, buffer, partition))
return 0;
return read_length; return read_length;
} }
@ -56,7 +57,8 @@ bool ExportFile(const Volume& volume, const Partition& partition, const FileInfo
if (!volume.Read(file_offset, read_size, buffer.data(), partition)) if (!volume.Read(file_offset, read_size, buffer.data(), partition))
return false; return false;
f.WriteBytes(buffer.data(), read_size); if (!f.WriteBytes(buffer.data(), read_size))
return false;
remaining_size -= read_size; remaining_size -= read_size;
file_offset += read_size; file_offset += read_size;
@ -85,11 +87,8 @@ bool ExportApploader(const Volume& volume, const Partition& partition,
const std::string export_name(export_folder + "/apploader.img"); const std::string export_name(export_folder + "/apploader.img");
File::IOFile apploader_file(export_name, "wb"); File::IOFile apploader_file(export_name, "wb");
if (apploader_file) if (apploader_file.WriteBytes(buffer.data(), *apploader_size))
{
apploader_file.WriteBytes(buffer.data(), *apploader_size);
return true; return true;
}
} }
return false; return false;
@ -154,11 +153,8 @@ bool ExportDOL(const Volume& volume, const Partition& partition, const std::stri
const std::string export_name(export_folder + "/boot.dol"); const std::string export_name(export_folder + "/boot.dol");
File::IOFile dol_file(export_name, "wb"); File::IOFile dol_file(export_name, "wb");
if (dol_file) if (dol_file.WriteBytes(buffer.data(), *dol_size))
{
dol_file.WriteBytes(buffer.data(), *dol_size);
return true; return true;
}
} }
return false; return false;