diff options
| author | Mat M <mathew1800@gmail.com> | 2018-06-05 17:24:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 17:24:17 -0400 |
| commit | 0dfd0cfa24c0152e4112c184aa04c380c2b7a579 (patch) | |
| tree | adf5f644f794f3fe2be40ed6c5a906eca3b3c4d8 /Source/Core | |
| parent | 36ff2a20d52ed9901ee5d24644b2d0e026a1fd2c (diff) | |
| parent | 85baca386a057704679eb17566cb1fca1260ee7a (diff) | |
Merge pull request #7083 from leoetlino/consistency
ES: Return ReturnCode in DiVerify for consistency
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/IOS/ES/ES.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/Core/IOS/ES/ES.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/Core/IOS/ES/ES.cpp b/Source/Core/Core/IOS/ES/ES.cpp index c16b96b23b..94b8c7e585 100644 --- a/Source/Core/Core/IOS/ES/ES.cpp +++ b/Source/Core/Core/IOS/ES/ES.cpp @@ -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; diff --git a/Source/Core/Core/IOS/ES/ES.h b/Source/Core/Core/IOS/ES/ES.h index 45157dd453..a6a5736937 100644 --- a/Source/Core/Core/IOS/ES/ES.h +++ b/Source/Core/Core/IOS/ES/ES.h @@ -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; |