From e1020cb67487554c6dae0d7fc37ef37fed81f494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Thu, 30 Mar 2017 18:39:24 +0200 Subject: [PATCH] Common: Remove dead code in NandPaths --- Source/Core/Common/NandPaths.cpp | 32 -------------------------------- Source/Core/Common/NandPaths.h | 2 -- 2 files changed, 34 deletions(-) diff --git a/Source/Core/Common/NandPaths.cpp b/Source/Core/Common/NandPaths.cpp index 9206fbe4e6..5ab7c2afdd 100644 --- a/Source/Core/Common/NandPaths.cpp +++ b/Source/Core/Common/NandPaths.cpp @@ -52,38 +52,6 @@ std::string GetTitleContentPath(u64 _titleID, FromWhichRoot from) (u32)(_titleID >> 32), (u32)_titleID); } -bool CheckTitleTMD(u64 _titleID, FromWhichRoot from) -{ - const std::string TitlePath = GetTMDFileName(_titleID, from); - if (File::Exists(TitlePath)) - { - File::IOFile pTMDFile(TitlePath, "rb"); - u64 TitleID = 0; - pTMDFile.Seek(0x18C, SEEK_SET); - if (pTMDFile.ReadArray(&TitleID, 1) && _titleID == Common::swap64(TitleID)) - return true; - } - INFO_LOG(DISCIO, "Invalid or no tmd for title %08x %08x", (u32)(_titleID >> 32), - (u32)(_titleID & 0xFFFFFFFF)); - return false; -} - -bool CheckTitleTIK(u64 _titleID, FromWhichRoot from) -{ - const std::string ticketFileName = Common::GetTicketFileName(_titleID, from); - if (File::Exists(ticketFileName)) - { - File::IOFile pTIKFile(ticketFileName, "rb"); - u64 TitleID = 0; - pTIKFile.Seek(0x1dC, SEEK_SET); - if (pTIKFile.ReadArray(&TitleID, 1) && _titleID == Common::swap64(TitleID)) - return true; - } - INFO_LOG(DISCIO, "Invalid or no tik for title %08x %08x", (u32)(_titleID >> 32), - (u32)(_titleID & 0xFFFFFFFF)); - return false; -} - std::string EscapeFileName(const std::string& filename) { // Prevent paths from containing special names like ., .., ..., ...., and so on diff --git a/Source/Core/Common/NandPaths.h b/Source/Core/Common/NandPaths.h index 4910e29465..53b9b1e099 100644 --- a/Source/Core/Common/NandPaths.h +++ b/Source/Core/Common/NandPaths.h @@ -30,8 +30,6 @@ std::string GetTicketFileName(u64 _titleID, FromWhichRoot from); std::string GetTMDFileName(u64 _titleID, FromWhichRoot from); std::string GetTitleDataPath(u64 _titleID, FromWhichRoot from); std::string GetTitleContentPath(u64 _titleID, FromWhichRoot from); -bool CheckTitleTMD(u64 _titleID, FromWhichRoot from); -bool CheckTitleTIK(u64 _titleID, FromWhichRoot from); // Escapes characters that are invalid or have special meanings in the host file system std::string EscapeFileName(const std::string& filename);