Permalink
Browse files

Merge pull request #7083 from leoetlino/consistency

ES: Return ReturnCode in DiVerify for consistency
  • Loading branch information...
lioncash committed Jun 5, 2018
2 parents 36ff2a2 + 85baca3 commit 0dfd0cfa24c0152e4112c184aa04c380c2b7a579
Showing with 4 additions and 4 deletions.
  1. +3 −3 Source/Core/Core/IOS/ES/ES.cpp
  2. +1 −1 Source/Core/Core/IOS/ES/ES.h
@@ -612,7 +612,7 @@ IPCCommandResult ES::DIVerify(const IOCtlVRequest& request)
return GetDefaultReply(ES_EINVAL);
}
static s32 WriteTmdForDiVerify(FS::FileSystem* fs, const IOS::ES::TMDReader& tmd)
static ReturnCode WriteTmdForDiVerify(FS::FileSystem* fs, const IOS::ES::TMDReader& tmd)
{
const std::string temp_path = "/tmp/title.tmd";
fs->Delete(PID_KERNEL, PID_KERNEL, temp_path);
@@ -636,7 +636,7 @@ static s32 WriteTmdForDiVerify(FS::FileSystem* fs, const IOS::ES::TMDReader& tmd
return FS::ConvertResult(fs->Rename(PID_KERNEL, PID_KERNEL, temp_path, tmd_path));
}
s32 ES::DIVerify(const IOS::ES::TMDReader& tmd, const IOS::ES::TicketReader& ticket)
ReturnCode ES::DIVerify(const IOS::ES::TMDReader& tmd, const IOS::ES::TicketReader& ticket)
{
m_title_context.Clear();
INFO_LOG(IOS_ES, "ES_DIVerify: Title context changed: (none)");
@@ -656,7 +656,7 @@ s32 ES::DIVerify(const IOS::ES::TMDReader& tmd, const IOS::ES::TicketReader& tic
const auto fs = m_ios.GetFS();
if (!FindInstalledTMD(tmd.GetTitleId()).IsValid())
{
if (const s32 ret = WriteTmdForDiVerify(fs.get(), tmd))
if (const ReturnCode ret = WriteTmdForDiVerify(fs.get(), tmd))
{
ERROR_LOG(IOS_ES, "DiVerify failed to write disc TMD to NAND.");
return ret;
@@ -37,7 +37,7 @@ class ES final : public Device
public:
ES(Kernel& ios, const std::string& device_name);
s32 DIVerify(const IOS::ES::TMDReader& tmd, const IOS::ES::TicketReader& ticket);
ReturnCode DIVerify(const IOS::ES::TMDReader& tmd, const IOS::ES::TicketReader& ticket);
bool LaunchTitle(u64 title_id, bool skip_reload = false);
void DoState(PointerWrap& p) override;

0 comments on commit 0dfd0cf

Please sign in to comment.