Don't check validity twice when creating DirectoryBlob

This commit is contained in:
JosJuice
2017-06-09 12:56:36 +02:00
parent a6bbf7e21b
commit 251828ccc0
3 changed files with 3 additions and 12 deletions

View File

@ -137,8 +137,7 @@ static bool PathEndsWith(const std::string& path, const std::string& suffix)
return true;
}
bool DirectoryBlobReader::IsValidDirectoryBlob(const std::string& dol_path,
std::string* root_directory)
static bool IsValidDirectoryBlob(const std::string& dol_path, std::string* root_directory)
{
if (!PathEndsWith(dol_path, "/sys/main.dol"))
return false;
@ -149,12 +148,6 @@ bool DirectoryBlobReader::IsValidDirectoryBlob(const std::string& dol_path,
return File::GetSize(*root_directory + "sys/boot.bin") >= 0x20;
}
bool DirectoryBlobReader::IsValidDirectoryBlob(const std::string& dol_path)
{
std::string root_directory;
return IsValidDirectoryBlob(dol_path, &root_directory);
}
std::unique_ptr<DirectoryBlobReader> DirectoryBlobReader::Create(const std::string& dol_path)
{
std::string root_directory;